server conf
merge