update to merge conf file template and su changes