update from merge
update build.xml