Merging with a change