Merge proposals

Diamond has no merge proposals.