repaired merging issues