Update .travis.yml
fix travis.yml merge conflicts