Attempt to solve conflicts