Fixing up merge artifacts.