diff --git a/.sops.yaml b/.sops.yaml
index 4fbf46c..ed53050 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -210,11 +210,8 @@ creation_rules:
     key_groups:
       - age:
           - *admin
-<<<<<<< Updated upstream
           - *proxmox-ha-server-1
           # proxmox-ha-server-1 added by sync-host-keys.sh
-=======
->>>>>>> Stashed changes
 
   # Host keytab for ha-server-2 FreeIPA enrollment (binary sops file).
   # Generated by scripts/ipa/create-nixos-ipa-host-account.sh.
@@ -222,8 +219,5 @@ creation_rules:
     key_groups:
       - age:
           - *admin
-<<<<<<< Updated upstream
           - *proxmox-ha-server-2
           # proxmox-ha-server-2 added by sync-host-keys.sh
-=======
->>>>>>> Stashed changes