Solving the conflicts