Fixed broken failed merge