shop api done
merge conflict