Fix config file conflict