Conflict solutions