local modify test.java 2
fix conflict