Fixed merged conflict build.xml