fix conflicts

js/controllers/addresses.js

@@ -0,0 +1,35 @@
+'use strict';
+
+angular.module('copay.addresses').controller('AddressesController',
+  function($scope, $rootScope, controllerUtils) {
+    $scope.title = 'Home';
+    $scope.oneAtATime = true;
+    $scope.addrBalance = {};
+
+    var w = $rootScope.wallet;
+
+    var _updateBalance = function () {
+      w.getBalance(function (balance, balanceByAddr) {
+        if (balanceByAddr  && Object.keys(balanceByAddr).length) {
+          $scope.balanceByAddr = balanceByAddr;
+          $scope.addrs =  Object.keys(balanceByAddr);
+          $scope.selectedAddr = $scope.addrs[0];
+          $scope.$digest();
+        }
+      });
+    };
+
+    $scope.newAddr = function() {
+      w.generateAddress().toString();
+      _updateBalance();
+
+      controllerUtils.setSocketHandlers();
+    };
+
+    $scope.selectAddr = function(addr) {
+      $scope.selectedAddr = addr;
+    };
+
+    _updateBalance();
+    w.on('refresh',_updateBalance);
+  });