Shop changes
merge