kaleidoscope as merge tool