diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml
index 97f3fcd0f31..f90cab68acd 100644
--- a/.github/workflows/quick-jobs.yml
+++ b/.github/workflows/quick-jobs.yml
@@ -18,8 +18,6 @@ jobs:
   meta:
     name: Meta checks
     runs-on: ubuntu-latest
-<<<<<<< HEAD
-=======
     env:
       cabal_build: >-
         cabal build --builddir=dist-newstyle-meta --project-file=cabal.meta.project
@@ -27,7 +25,6 @@ jobs:
         gen-paths-module
         gen-spdx
         gen-spdx-exc
->>>>>>> d8147f62c (Rename projects to cabal.*.project)
     # This job is not run in a container, any recent GHC should be fine
     steps:
       - name: Set PATH
@@ -153,9 +150,4 @@ jobs:
       - name: Check Release with Pinned Hackage
         run: cabal build all --dry-run --project-file=cabal.release.project
       - name: Check Release with Latest Hackage
-<<<<<<< HEAD
-        run: cabal build all --dry-run --project-file=cabal.project.release --index-state="hackage.haskell.org HEAD"
-
-=======
         run: cabal build all --dry-run --project-file=cabal.release.project --index-state="hackage.haskell.org HEAD"
->>>>>>> d8147f62c (Rename projects to cabal.*.project)
diff --git a/Makefile b/Makefile
index ea8f4ac7226..31d0a66f064 100644
--- a/Makefile
+++ b/Makefile
@@ -75,15 +75,9 @@ doc/buildinfo-fields-reference.rst : \
 	cabal run buildinfo-reference-generator buildinfo-reference-generator/template.zinza | tee $@
 	git diff --exit-code $@
 
-<<<<<<< HEAD
 # analyse-imports
 analyse-imports : phony
-	find Cabal-syntax/src Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --
-=======
-.PHONY: analyse-imports
-analyse-imports :
 	find Cabal-syntax/src Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project analyse-imports --
->>>>>>> d8147f62c (Rename projects to cabal.*.project)
 
 # ghcid
 
diff --git a/bootstrap/generate_bootstrap_plans b/bootstrap/generate_bootstrap_plans
index 86e50c76063..19a3c5f4543 100755
--- a/bootstrap/generate_bootstrap_plans
+++ b/bootstrap/generate_bootstrap_plans
@@ -10,7 +10,7 @@ run() {
   local drv="ghc-$ver"
   echo "$ver"
   nix build -f "$ghcs_nix" $drv
-  (cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.release.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
+  (cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.bootstrap.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
   jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
   cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json"
 }