Describe how the conflict has been solved or is being solved. Include public policies or court cases that impact the solution.