fixing failed merge in .travis.yml