MANAGING CONFLICT