Removed leftover from failed merge