remove conflict in build.xml