My solution to the current conflict (criticisms appreciated):