Change to server
merge changes