Fixed up a messed up merge