.travis.yml fix conditional for merge

Hopefuly fixed, this commit shouldn't merge as well...