fix merge consequences