Update Main.java
fixed conflicts