create_merge_conflict