Fixed conflict in LearningJava.java