merge conf
merge