config
merge+fix