# Solving Conflicts

> 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.

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.

Whenever Studio detects a conflict between the local file and the one found in the remote repository, the **Solve conflicts** window is displayed.

![docs image](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/latest/user-guide/using-file-diff), showing the differences between the **Remote** version of the file and the **Local** version.

The following table describes the options available in the **Solve conflicts** window.

| Option | Description |
| --- | --- |
| **Choose Left** | Select the left file representing the file in the remote repository to push. |
| **Choose Right** | Select the right file representing the file in the local repository to push. |
| **Save** | Click **Save** after choosing the left or right file. |
| **Cancel** | Cancel the operation and exit the **Solve conflicts** window. |
| **Previous** | Navigates to the previous change in the compared files. |
| **Next** | Navigates to the next change in the compared files. |
| **Collapse All** | Collapses all nodes in the `.xaml` files. |
| **Expand All** | Expands all nodes in the `.xaml` files. |