change location
merge code