Organic merge

Revenue is ready to review.

Soft merged shapes reveal a new state while keeping the underlying UI readable.