config changes
merged