diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
index 479758c..0c98e9a 100644
--- a/.github/workflows/cancel.yml
+++ b/.github/workflows/cancel.yml
@@ -4,8 +4,5 @@ on: [push]
 jobs:
   cancel:
     uses: opengood-aio/central-workflows/.github/workflows/workflow-cancel.yml@main
-<<<<<<< Updated upstream
     secrets:
       workflow-token: ${{ secrets.WORKFLOW_TOKEN }}
-=======
->>>>>>> Stashed changes
diff --git a/sync.yml b/sync.yml
index 69f2cb0..1b4f993 100644
--- a/sync.yml
+++ b/sync.yml
@@ -3,4 +3,3 @@ version: 2.0
 ci:
   provider: GitHub Actions
   template: gradle/lib
-