Silence a few hundred errors.
Fix merge errors.