diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
index 5703c751e..57573b4d0 100644
--- a/js/controllers/copayers.js
+++ b/js/controllers/copayers.js
@@ -8,11 +8,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
 
     $scope.skipBackup = function() {
       var w = $rootScope.wallet;
-<<<<<<< HEAD
       w.setBackupReady(true);
-=======
-      w.setBackupReady();
->>>>>>> 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
     };
 
     $scope.backup = function() {
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 481719830..6b91a8b0d 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -2433,9 +2433,8 @@ Wallet.prototype.isShared = function() {
  * @desc Returns true if the keyring is complete and all users have backed up the wallet
  * @return {boolean}
  */
-Wallet.prototype.isReady = function() { << << << < HEAD
-  var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); === === =
-  var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported); >>> >>> > 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
+Wallet.prototype.isReady = function() {
+  var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin);
   return ret;
 };