get location fixes
merge
merge