Added markers to the map
fixed merge