Fixed failed merge