diff --git a/data/mntner/CKARLS-MNT b/data/mntner/CKARLS-MNT
index 74836b8b6..b497eb779 100644
--- a/data/mntner/CKARLS-MNT
+++ b/data/mntner/CKARLS-MNT
@@ -3,6 +3,7 @@ admin-c:            CKARLS-DN42
 tech-c:             CKARLS-DN42
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKvYrk4qxU7JqbA5OXk+qHZAJjxrZG1erwjv8nqgw0uZ
 =======
 auth:               pgp-fingerprint ED49C58A2CBBF462ABD6432B5013633FE1F2E4F5
@@ -10,5 +11,8 @@ auth:               pgp-fingerprint ED49C58A2CBBF462ABD6432B5013633FE1F2E4F5
 =======
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMiPIkSrp07kZDawYQkrq4vsvPc97qoz6KvpZSKyh/1P
 >>>>>>> 942fdc1bc (data/mntner/CKARLS-MNT aktualisiert)
+=======
+auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKvYrk4qxU7JqbA5OXk+qHZAJjxrZG1erwjv8nqgw0uZ
+>>>>>>> 052a15cc0 (data/mntner/CKARLS-MNT aktualisiert)
 mnt-by:             CKARLS-MNT
 source:             DN42
\ No newline at end of file