Fixed up bad merge