edit .travis.yml
remove env from .travis.yml
resolve conflict