Map ammelioration
Conflit resolved