Merging content changes