fixed test.java
Fixed merge error