5th commit
the branch1 first commit total 6th
change on same file and try to merge
Merge branch 'branch1'

Conflicts:
	readme