Personalize the config
Resolve conflicts