fixed merge conflicts in travis.yml