Solve solarized submodule conflict