Cleaned up merge artifacts.