merge my old conf file with this