removes the powerline_theme setting so the right side of the bar returns
changes merge tool to vim