fix_merge_conflict