fixed merge issues with socket.js