fix travis.yml post merge