Managing Conflict for Improved Performance