correct config.json after conflict