Sorry, fixed.

service/src/main/resources/assets/statics/js/main.js

@@ -40,11 +40,7 @@
     app.factory('AppSettings', ['$http', function($http) {
 
         // fallback into defaults, if everything fails, world collapses, hell freezes and /startup will not resolve
-<<<<<<< HEAD
-        var domainName = '52.25.28.64', port = 8080, schema = "http";
-=======
         var domainName = 'ctf.krakyournet.pl', port = "https", schema = 443;
->>>>>>> origin/master
 
         return {