Add note about upstream merge