fix merge and tag messages