Resolved conflicts with ant
Resolved conflicts with ant