If you recently updated your theme but had to deal with conflicts, you can avoid them by following this guide.

If you are an advanced user, it's suggested not to do this as some custom configurations might get overwritten by our new updates.

When you're about to update your theme, click on Advanced and then select Resolve Conflicts based on New Theme

Then click Update. Done! Easy as that.

Simply, it will prioritize our updates instead of the standard text of your current theme file content, ensuring that you have the latest updates released by our team.