merged solarized