fixed erroneous merge in Java code