resolve branch conflict in build.xml