add new location
merge with upstream