Merge modifications in