fix serveral bugs
fix conflicts
update socketServer