fixed mast failed merge