fixed conflict

Author: Stefania

src/socket-daemon.js

@@ -135,14 +135,11 @@ export default class SocketDaemon {
             if (r.response.url.indexOf(PROTOCOL.HTTPS) === 0) {
               this.selectedProtocol = PROTOCOL.HTTPS;
             }
-<<<<<<< HEAD
             else {
               // Protocol http, force 127.0.0.1 for old agent versions too
               this.agentInfo[this.selectedProtocol] = this.agentInfo[this.selectedProtocol].replace('localhost', '127.0.0.1');
             }
-=======
             this.readerWriter.initPluginUrl(this.agentInfo[this.selectedProtocol]);
->>>>>>> 93943b354033c52810ae98200bee481ba5eef5d9
             return true;
           }
           return false;