fixed failed merge conflict