diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index be492431..7dd2010e 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -3988,7 +3988,6 @@ class SSH2
      */
     protected function append_log_helper(int $constant, string $message_number, string $message, array &$message_number_log, array &$message_log, int &$log_size, &$realtime_log_file, bool &$realtime_log_wrap, int &$realtime_log_size)
     {
->>>>>>> 3.0
         // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
         if (strlen($message_number) > 2) {
             Strings::shift($message);