Merge proposals

The Shanghai team has no merge proposals.