config
merge conflict resolved
collect, config