Update .travis.yml

Fixed merge issue