vnc new commit
resolve conflict in server.js