fix merge with threats
fix merge with threats