second remark
commit branch1
Merge branch 'branch1'

Conflicts:
	superproject/superproject.logic/src/main/java/com/peter/Main.java