local modify dev test.java
fix conflict