merge conf