trying to fix merge conflict
fix merge
fixed merge conflicts

Conflicts:
	java1.java