merging over conflicts