change first line
change last line
Merge branch 'other'
MergeConflict.txt