Switch to Kaleidoscope for diffing and merging