refactor locations
merge