merge changes to server