create branch develop
submit a new message
Merge branch 'develop' of https://github.com/JarvisZhang/HelloWorld into develop
this is the new commit msg
this is the newest commit msg
Merge branch 'develop' of https://github.com/JarvisZhang/HelloWorld into develop
Merge branch 'develop'

Conflicts:
	hello.py