fixed merge conf
fixed