Resolved Merge Conflicts for build.xml