Modified main config
Fixed merge