Remove node_modules
Merge
Clean
server
remove node_modules
fix conflicts