fix merge-related catastrophe