changed first line
changed last line
resolve merge conflict
resolve merge conflict 2
Merge branch 'feature'
original MergeConflict.txt
change first line
change last line
merge
cherry pick