Fixed up a failed merge