# Solving Conflicts

> Resolve merge conflicts in Studio's Git integration, using the three-way merge view for text files or the Solve Conflicts window for XAML workflows.

GIT integration with Studio comes with a feature for solving conflicts that may occur when performing the **Rebase** or **Push** command, found in the **Commit Changes** window. How you resolve a conflict depends on the file type.

## Resolving conflicts in text files

A conflict in a text file — a `.cs` coded workflow, a `.json` configuration file, a `.txt` file, and similar — opens in a three-way merge view, with the **Local** and **Remote** versions displayed side by side and an editable **Result** pane beneath them. Conflicts arriving from a **Pull**, a **Merge**, and a **Rebase** all open in this same view.

1. Review the **Local** and **Remote** panes, each labeled with the branch it came from.
2. For a conflicting section, select the version you want to keep. The **Result** pane updates to match.
3. If neither version is correct, edit the **Result** pane directly.
4. Use **Next Conflict** and **Next Unsolved Conflict** to move between conflicts. A conflict counter tracks how many remain.
5. Save the file once every conflict is resolved.

:::note
`project.json` conflicts are resolved by a dedicated handler that merges most changes automatically, without prompting you.
:::

## Resolving conflicts in XAML files

A conflicted `.xaml` workflow opens in the **Solve conflicts** window instead of the three-way merge view.

![Studio interface](https://dev-assets.cms.uipath.com/assets/images/studio/studio-docs-image-169109-17a29d5c.webp)

The window is similar to [Workflow Diff](https://docs.uipath.com/studio/standalone/2026.10/user-guide/using-file-diff), showing the differences between the **Remote** version of the file and the **Local** version.

1. Review the differences between the **Remote** version (left) and the **Local** version (right). Use **Previous** and **Next** to move between changes, and **Collapse All** or **Expand All** to manage how much of the file is shown.
2. For each conflicting section, select **Choose Left** to keep the remote version, or **Choose Right** to keep the local version.
3. Select **Save** to apply your choice, or **Cancel** to exit without resolving the conflict.