Update .travis.yml

Fixed merge conflict issues