Changed colorscheme.
Resolved conflicts.