first commit on branch
branch1 change 2nd
change something on master
Merge branch 'branch1'

Conflicts:
	I am in branch.txt
	readme.txt
Add something file