Merges server side edits