diff --git a/..backportrc.json.kate-swp b/..backportrc.json.kate-swp
new file mode 100644
index 0000000000..9469161cab
Binary files /dev/null and b/..backportrc.json.kate-swp differ
diff --git a/.backportrc.json b/.backportrc.json
index c09fd186f0..7af0021d2e 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -2,7 +2,11 @@
   "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"
   }