What happens if there are conflicts between the changes made in Shopify and the changes merged in GitHub?

Follow