comfirm merge is ok & edit Main.java