Conflict Resolution after the Pandemic