fixed config.json after merge gone awry