Ant build fix
Merge conflict