MergeConflictFixMaybe