fixed merge conflicts in build.xml