Fix the config.
Fixing conflict