add Kaleidoscope for diff/merge and make default