diff --git a/public/js/controllers/transactions.js b/public/js/controllers/transactions.js
index 132881b..52b12c9 100644
--- a/public/js/controllers/transactions.js
+++ b/public/js/controllers/transactions.js
@@ -22,12 +22,7 @@ angular.module('insight.transactions').controller('transactionsController',
       txId: txid
     }, function(tx) {
       $scope.tx = tx;
-<<<<<<< HEAD
-      console.log(console.log(tx));
       $scope.txs.push(tx);
-    }, function() {
-      $rootScope.flashMessage = 'Transaction Not Found';
-=======
     }, function(e) {
       if (e.status === 400) {
         $rootScope.flashMessage = 'Invalid Transaction ID: ' + $routeParams.txId;
@@ -38,7 +33,6 @@ angular.module('insight.transactions').controller('transactionsController',
       else {
         $rootScope.flashMessage = 'Transaction Not Found';
       }
->>>>>>> matiu/feature/11showsyncstatus
       $location.path('/');
     });
   };