pulling from Shopify
resolving merge conflicts in theme and product liquid files