Solve conflictorol