first commit on first branch
second commit on first brach
another commit on master
Merge branch 'firstbranch'

Conflicts:
	file1.java