Solving conflict