update merge tools