Refactored merge conf from file