Update ci.yml

Author: jsumners

.github/workflows/ci.yml

@@ -53,11 +53,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-      - uses: fastify/github-action-merge-dependabot@v2.2.0
-=======
       - uses: fastify/github-action-merge-dependabot@v2.1.1
->>>>>>> 5e5da89adac942de074e909b4b65a8fcb2e53e72
         if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{secrets.GITHUB_TOKEN}}