Fixed up my failed merge