local changes
merge
use mayansmoke colors scheme for diffs