commit(1)
Merge remote-tracking branch 'origin/branch(1)'

Conflicts:
	test_project/bin/test/sy/hello.class
	test_project/src/test/sy/hello.java