branch1 first commit
still on the master branch
added to branch 1
first change to master
second change to branch 1
another change to the master file
final update to branch 1 before merging with master branch.
resolve conflict