diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 9cc6ce7d0aa..c62b9432b29 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -106,12 +106,8 @@ typedef enum {
 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-<<<<<<< readconf.c
-	oServerAliveInterval, oServerAliveCountMax,
-	oVersionAddendum,
-=======
 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
->>>>>>> 1.1.1.15
+	oVersionAddendum,
 	oDeprecated, oUnsupported
 } OpCodes;