Ant and Travis removed
Fix merge conflict