shop names change
merge