Modifications on merge