conflict solutions