diff --git a/..backportrc.json.kate-swp b/..backportrc.json.kate-swp
deleted file mode 100644
index 9469161cab..0000000000
Binary files a/..backportrc.json.kate-swp and /dev/null differ
diff --git a/.backportrc.json b/.backportrc.json
index 7af0021d2e..1c5d20bad8 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -2,11 +2,7 @@
   "repoOwner": "terrapkg",
   "repoName": "packages",
   "resetAuthor": true,
-<<<<<<< HEAD
-  "targetBranchChoices": ["f39", "f40", "f41", "f42", "frawhide"],
-=======
   "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
->>>>>>> 77cef2498 (chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823))
   "branchLabelMapping": {
     "^sync-(.+)$": "$1"
   }