how to solve conflicts