classpath git conflict - test