Map conflict fix