diff --git a/public/js/controllers/authCtrl.js b/public/js/controllers/authCtrl.js
index 58ae4bc23c..249888ea46 100644
--- a/public/js/controllers/authCtrl.js
+++ b/public/js/controllers/authCtrl.js
@@ -61,6 +61,7 @@ angular.module('authCtrl', [])
         }
       }
 
+<<<<<<< HEAD
       $scope.auth = function() {
         var data = {
           username: $scope.loginUsername,
@@ -74,6 +75,12 @@ angular.module('authCtrl', [])
               runAuth(data.id, data.token);
             }).error(errorAlert);
         }
+=======
+    $scope.auth = function() {
+      var data = {
+        username: $scope.loginUsername || $('#login-tab input[name="username"]').val(),
+        password: $scope.loginPassword || $('#login-tab input[name="password"]').val()
+>>>>>>> 99dccc288e4ab6c61a317437616b79d157e8b68b
       };
 
       $scope.playButtonClick = function(){