merging conf