small config changes
merge