fix merge tman