merge conf file from master branch