fix merge with threats