How dow the conflict get solved?