conflict solved logo