difference-in-how-a-conflict-is-resolved