Removed conflict markup on build.xml