Resolving merge conflict in Main.java