New Branch
new Branch add sout
Merge branch 'newBranch'

Conflicts:
	Main.java