Added map to show location of shops
Resolved conflicts