added map with json markers
Fixed map merging conflicts