travis.yml  - after bad merge