refactoring in merge-conf