Fixes merge conflicts with .travis.yml