Back to Managing Conflict for Productivity