don't use ksdiff for merges
ramped up theme for powerline