corrected typo in config
fixed conflict