Solving conflics2