fixMerge