fix travis.yml
merge