Broke config in merge