merge algorithms
doing merge
merge Main.java