fix .travis.yml conflicts.