Fix issues in configuration after merge.