updated conf
update conf to match dev-master