Map Fix, Design edit, marker add
merge fix