starting merge conflict branch
some work on the branch
changes on master. the history diverges
merging of branch. hopefully there will be conflicts.

Conflicts:
	file-3.txt
more work on file3 after the merge
Merge remote-tracking branch 'origin/master'