Indentation fix.
Configure Kaleidoscope as diff and merge tool.