use config dict
tub tests
merge conflict