> For the complete documentation index, see [llms.txt](https://staylime.com/docs/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://staylime.com/docs/theme-companion/theme-updates/when-conflicts-get-hard.md).

# When conflicts get hard

What to do when the resolve buttons aren't enough.

Most conflicts are resolved with a click. Sometimes one isn't — not because something went wrong, but because merging has natural limits: when two sides rewrite the same code far enough apart, no tool can combine them automatically — someone has to decide what the result should be. Theme Companion's job is to find every such place and give you a way through it, not to make the decision disappear. Here are the three situations you may run into, and the way through each.

Two things to keep in mind first. During conflict resolution, the **Full file preview** is read-only — editing happens only inside conflicts: every change goes through an explicit, visible decision, so nothing slips into your theme unnoticed. And if you're not sure which parts of a file were yours, the **Before update** tab shows exactly that — see [Resolving conflicts](/docs/theme-companion/theme-updates/resolving-conflicts.md).

### "I need to change code near a conflict, but outside the editable area"

Resolve the conflicts first and finish the update, then make the remaining edit in the **updated theme's** code: in your Online Store, open the updated theme and choose **Edit code**. Your live theme isn't affected until you publish, so you can polish the updated theme as long as you need before going live.

### "Both sides changed this code so much that I can't combine them"

Pick the side that's closer to the result you want — **Keep my current** or **Keep updated** — and adjust the rest in the updated theme's **Edit code** after finishing the update. If there are many places like this across your theme, this is a job for the developer who customized your theme.

### "My customization refers to code that no longer exists — or moved to another file"

This means the new version restructured the theme deeply: that part of your customization can't be merged in place — it needs to be re-applied where the code lives now. The same applies when a whole file you customized is no longer part of the new version — the files listed as [customizations not present in the updated version](/docs/theme-companion/theme-updates/understanding-your-update-summary.md#files-with-customizations-not-present-in-the-updated-version) on your update summary.

If it's just a place or two, re-apply them yourself through the updated theme's **Edit code** after finishing the update. If it's more than that, this becomes development work — involve the developer who made these customizations.

***

All three situations grow with version distance. Once you're through this update, staying current keeps the next ones small — see [The longer you wait, the harder the update](/docs/theme-companion/theme-updates/how-theme-updates-work.md).


---

# Agent Instructions
This documentation is published with GitBook. GitBook is the documentation platform designed so that both humans and AI agents can read, navigate, and reason over technical content effectively. Learn more at gitbook.com.

## Querying This Documentation
If you need additional information that is not directly available in this page, you can query the documentation by asking a question.

Perform an HTTP GET request on the following URL with the `ask` and `goal` query parameters:

```
GET https://staylime.com/docs/theme-companion/theme-updates/when-conflicts-get-hard.md?ask=<question>&goal=<user_goal>
```

`ask` is the immediate question: it should be specific, self-contained, and written in natural language.
`goal` is what the user is ultimately trying to achieve, the reason they need the answer. Sharing it helps GitBook give you a better, more relevant answer. A goal is most helpful when it describes the outcome the user wants rather than restating the question. For example, with `ask=how do I create an API token`, a goal like `automate deployments from our CI pipeline` lets GitBook tailor the answer to that use case.

The response will contain a direct answer to the question and relevant excerpts and sources from the documentation.

Use this mechanism when the answer is not explicitly present in the current page, you need clarification or additional context, or you want to retrieve related documentation sections.