make a change on the branch
a change on top of the third line, made after a change on the same line in master
merge the changes on the non-master branch