How was the conflict resolved