I'm in a branch
another commit in a branch
in a branch, another commit
Merge branch 'master' into branch1

Conflicts:
	TestProject/src/Main.java