What is the resolution of the conflict?

The context does not provide any information about the resolution of the conflict, so I cannot answer this question from the provided context.