# Conflicts:
#	app/code/Rokanthemes/OnePageCheckout/view/frontend/web/js/action/update-item.js
#	app/code/Rokanthemes/OnePageCheckout/view/frontend/web/js/model/shipping-rate-processor/new-address.js
#	app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml