editting travis.yml
travis.yml conflict
t