Merged changes from server