Make a change on the branch
Make a change on the master branch
a contradictory edit
Fixed merge conflicts