fix a merge conflict in .travis.yml