Socketio last merge