conflict solved