Update merge.java