merging modifications