added kaleidoscope as merging and diff tool