Added vision config.
Fixed merge conflict.