managing supervisory-related conflicts