Fixed up merge