diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index 3352f262..0cf5a0c5 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -363,11 +363,7 @@ namespace data
 				if (!s) return;
 			}
 			
-<<<<<<< HEAD
             if ((address->s[31] & 0x80) || !i2p::data::CheckStaticKey(address->s, GetIdentHash()))
-=======
-            if (!i2p::data::CheckStaticKey(address->s, GetIdentHash()))
->>>>>>> 146e446b (save only non-default peer profile)
                 continue; // skip address
 			
 			if (address->transportStyle == eTransportNTCP2)