"and peacefully resolved a conflict we'd been in"