conflicts solved w