_conf added to branch