diff --git a/public/misc/script.index.js b/public/misc/script.index.js
index d3158ea..972e144 100644
--- a/public/misc/script.index.js
+++ b/public/misc/script.index.js
@@ -49,19 +49,11 @@ $(document).ready(function(){
                                         token: data.SecureToken
                                     }))
                                 }
-<<<<<<< HEAD
                             }).done(function(_data, _textStatus, jqXHR) {
                                 NProgress.inc(1 / XHR.length);
                                 console.log('CrossDomain login succeeded for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ']');
                             }).fail(function(jqXHR) {
                                 console.log('CrossDomain login failed for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ')]');
-=======
-                            }).done(function(data, textStatus) {
-                                NProgress.inc(1 / XHR.length);
-                                console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
-                            }).fail(function(_jqXHR, textStatus, errorThrown) {
-                                console.log('CrossDomain login failed for at least one domain [' + textStatus + ':' + errorThrown + ']');
->>>>>>> c94b73606231da5206372f69103173d56135a960
                                 // Should check why this failed (timeout or bad request?), and if this is the origin domain, take action
                             }));
                         });