refactor locations
conflicts