extracting locations and coordinates files
merge conflicts