fixed failed merge file