When syncing your store with the latest upstream changes, any conflicts with your customizations can now be resolved through an interactive step-by-step interface. Review each conflict, compare your version with the incoming change, and choose how to proceed — all without leaving the admin panel.
