diff --git a/src/danog/MadelineProto/MTProto.php b/src/danog/MadelineProto/MTProto.php
index 41f59475d..5ecf548b1 100644
--- a/src/danog/MadelineProto/MTProto.php
+++ b/src/danog/MadelineProto/MTProto.php
@@ -269,15 +269,8 @@ class MTProto extends \Volatile
         }
         foreach ($this->calls as $id => $controller) {
             if (is_array($controller) || $controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
-<<<<<<< HEAD
                 $controller->discard();
-            } else var_dump($controller->getCallState());
-=======
-                unset($this->calls[$id]);
-            } else {
-                var_dump($controller->getCallState());
             }
->>>>>>> d2ce6c06842a023a088ca7ac2b6d3967641a868d
         }
         // Detect ipv6
         $this->ipv6 = (bool) strlen(@file_get_contents('http://ipv6.test-ipv6.com/', false, stream_context_create(['http' => ['timeout' => 1]]))) > 0;
diff --git a/tests/testing.php b/tests/testing.php
index b0ae84a85..02e55bd40 100755
--- a/tests/testing.php
+++ b/tests/testing.php
@@ -121,7 +121,7 @@ echo 'Serializing MadelineProto to session.madeline...'.PHP_EOL; echo 'Wrote
 
 if (stripos(readline('Do you want to make the secret chat tests? (y/n): '), 'y') !== false) {
     $start = false;
-    $MadelineProto->request_call('@danogentili', '\pony');
+    $MadelineProto->request_call('@vagent', '\pony');
     while (1) {
         $MadelineProto->get_updates();
     }