merged repairtool