Hello World
Hello GitHub World
Testing...
Hello GitHub
Merge branch 'test'

Conflicts:
	HelloWorld.java
Really merging
start button action