Can you double check this with git blame to see what happened, I would favor the upstream from the downstream usually.

View Change

To view, visit change 46440. To unsubscribe, or for help writing mail filters, visit settings.