test data is loaded
merging
trying to get points on the map
fixed conflicts