push naar branch
enter
commit
Merge branch 'branch'

Conflicts:
	BranchTest.java