diff --git a/docroot/git/push.php b/docroot/git/push.php
index b2a838d..d7b582d 100755
--- a/docroot/git/push.php
+++ b/docroot/git/push.php
@@ -12,15 +12,9 @@
   system ( "echo 'Message: " . $pData->head_commit->message . "' >> /tmp/post.log" );
 
   if ($pData->head_commit->message [0] != '!') {
-<<<<<<< HEAD
-    system ( "echo 'START NO ESC' >> /tmp/post.log" );
-    exec( "/usr/local/bin/git -C /usr/web/sites/app.zirror.com pull >> /tmp/git.log" );
-=======
-    system ( "echo 'NO ESC' >> /tmp/post.log" );
-    $sLog [0] = system ( "/usr/local/bin/git -C /usr/web/sites/app.zirror.com pull" );
 
-    system ( "echo '[" . json_encode ( $sLog ) . "]' >> /tmp/system.log" );
->>>>>>> 777e488372f34ed1ef34025293225ca7fa9b006c
+    system ( "echo 'START NO ESC' >> /tmp/post.log" );
+    exec ( "/usr/local/bin/git -C /usr/web/sites/app.zirror.com pull >> /tmp/git.log" );
 
     system ( "echo 'END' >> /tmp/post.log" );
   } else {