commit HelloWorld.java
commit2 HelloWorld
Merge branch 'develop'

Conflicts:
	sample_src/src/sample_src/HelloWorld.java

resolve HelloWorld.java
resolve commit