Fix coveralls merge