fix conflict in .travis.yml