modify main in dev
insert in Main.java
conflict modify
conflict fixed