merge .travis
cancel stash