fix conflict in Preprocessor.java