Fix config
Merge