Make a textual change in master.
Added second change in master
Added added in second branch
Resolve the merge conflict, merging second branch into master.