semi ok shopperApp
merge