Alert conflict solved