Added popup js on map page
Resolved merge issues
Resolve merge issues