User conflict fix