diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 65a5be4..9d2295c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,11 +96,7 @@ jobs:
         include:
           - platform: windows-latest
             qt_version: "6.9.0"
-<<<<<<< HEAD
-            target: amd64
-=======
             target: x86_64
->>>>>>> origin/windows-legacy
           - platform: ubuntu-22.04
             qt_version: "6.9.0"
             target: amd64