merge proposals and diff integration