Fix a failed merge in config