message: merge conflict corrected
diff: </div>
  </agm-info-window>
  </agm-marker>
  - <!-- Should display orgnization, not organization user
  <agm-marker *ngFor="let o of organizations " [latitude]="o.latitude " [longitude]="o.longitude " (mouseOver)="handleMarkerMouseOver($event) "
  iconUrl="http://maps.google.com/mapfiles/ms/icons/green-dot.png">
  </a>
  </div>
  </agm-info-window>
  - </agm-marker> -->
  + </agm-marker>
  </agm-map>
  </div>
  </div>
  