resolve conflicts
correct merge and socket.io conflicts