fixing a merge error with travis.yml