add for trigger confilit