commit and push test_branch in master
merging attempt

Conflicts:
	main/src/java/com/test/SomeClass.java
in local "test_new_branch"
local "remote_branche" before pushing remote
Merge branch 'test_new_branch'

Conflicts:
	main/src/java/com/test/SomeClass.java