minor
merg conf resolve