Create merge_conflict.txt

merge_conflict