changes .travis.yml
conclude merge