fixup MergeConflicts