Managing conflict between two team members