add confd support
merge