Commit on master - file 5
Commit in int2
Merge branch 'master' into int2
One more commit
Commit in master
Merge branch 'master' into int2

Conflicts:
	test2.txt