Hello from Java
Add from Java
Change class name to HelloDemo
Add ! to the end
Add a spce before brace
Pending from Java
Merge branch 'modified'

Conflicts:
	Hello.java
Add from Java
Delete Hello.java
Merge branch 'newbranch'
Add again
Delete from Java
Merge branch 'newbranch'

Conflicts:
	HelloDemo.java
Change class name to HiDemo
Change class name to Demo
Merge branch 'newbranch'

Conflicts:
	HelloDemo.java
Delete Demo.java
Change class name to HelloDemo
Change class name in error
Change class name to HelloDemo