"With the conflict resolved,"