bye bye test.java and myTest.java
merge fix