added Oauth key to .travis.yml
resolved conflict