Fixed Shopify namespace issue.
Fixed merge conflicts