Fix making config conflicts