added build xml
fixing issue with merge
merge issue