Try to solve merge conflict in classpath