took out merge lines in build2.xml