Adding Kaleidoscope for diff/merge