Successful build.xml
resolved merge conflicts