Add lat and lon to scope.markers
merge conflicts