locator site cleanup
merge edit