Conflict solved