fix up merge errors.