merge modifications