merged travis-ci lines