diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java b/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
index 685b15ab..33864329 100755
--- a/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
+++ b/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
@@ -559,10 +559,7 @@ private void startRoundTripMeasurement() {
                 }
             }
         } else {
-<<<<<<< HEAD
-=======
             // reducing from error to debug as its not all that important of a message these days to have such promotion
->>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
             log.debug("startRoundTripMeasurement cannot be executed due to missing scheduler. This can happen if a connection drops before handshake is complete");
         }
     }
diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java b/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java
index 1f69f72c..2350b2b6 100644
--- a/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java
+++ b/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java
@@ -539,13 +539,9 @@ protected void onPing(RTMPConnection conn, Channel channel, Header source, Ping
                 conn.pingReceived(ping);
                 break;
             default:
-<<<<<<< HEAD
                 if (isDebug) {
                     log.warn("Unhandled ping: {}", ping);
                 }
-=======
-                log.debug("Unhandled ping: {}", ping);
->>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
         }
     }