added java file Main
resolved conflict