Conflict Resolution When You’re Not Fighting