Fixed up that conflict