conflict fix for name