remove conflicting lines of code and update the server to connect