changing challenge.java
merging
please be fixed