Use Kaleidoscope as merge tool