manager conflict fix