diff --git a/README.md b/README.md
index bd49181..e80b33d 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,7 @@ This is a composite Gitea Action (Linux runner) for deploying repository content
   with:
     fetch-depth: 0
 - name: "Deploy"
-<<<<<<< HEAD
   uses: https://code.klank.school/riviera/actions-file-deployer@v3
-=======
-  uses: https://code.klank.school/riviera/actions-file-deployer@v2
->>>>>>> c2546a80a3777e62d79d9e9b12c0d430b2ef3aa3
   with:
     remote-protocol: "sftp"
     remote-host: "ftp.example.com"
@@ -69,11 +65,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Deploy"
-<<<<<<< HEAD
         uses: https://code.klank.school/riviera/actions-file-deployer@v3
-=======
-        uses: https://code.klank.school/riviera/actions-file-deployer@v2
->>>>>>> c2546a80a3777e62d79d9e9b12c0d430b2ef3aa3
         with:
           remote-protocol: "sftp"
           remote-host: "ftp.example.com"