valid travis.yml merge