# Source: https://gitbook.com/docs/guides/editing-and-publishing-documentation/how-to-handle-merge-conflicts-in-gitbook.md

# How to handle merge conflicts in GitBook

Merge conflicts in GitBook occur when changes in a [change request](https://app.gitbook.com/s/NkEGS7hzeqa35sMXQZ4X/collaboration/change-requests) conflict with primary content. Here’s how to resolve them to maintain the best version of your documentation:

{% stepper %}
{% step %}

### Understand the conflic

Conflicts can happen when a merge introduces incompatible changes, such as when you edit a content block that has been changed, or you remove files that GitBook is trying to update.&#x20;

For example, if someone else on your team opens a change request at the same time you do, edits a few blocks and merges it, this will update the primary content. Your branch will be outdated, and you’ll be prompted to update your change request to bring in their changes.&#x20;

However, if you’ve edited the same blocks as your teammate, you’ll need to decide which version you want to keep, and GitBook will flag it as a conflict.

<figure><img src="https://1940848424-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FLBGJKQic7BQYBXmVSjy0%2Fuploads%2FkeFeGvrJ4sFGxco2fcq1%2Fconflicts%20detected.jpg?alt=media&#x26;token=daaf79fe-9980-41e9-a033-4a04ead5b690" alt=""><figcaption><p>If you try to update or merge a change request with conflicts, you’ll see a prompt and can follow the flow to resolve them.</p></figcaption></figure>
{% endstep %}

{% step %}

### Review and resolve conflicts

If there’s a conflict in your change request, you’ll see a notification when you try to merge. GitBook will show how many conflicts there are, and guide you through reviewing the two versions:

* <mark style="color:purple;">**Primary (Purple)**</mark> – The content currently in your GitBook space.
* <mark style="color:green;">**Changed (Green)**</mark> – The changes proposed in this change request.

You can use the **Keep primary** or **Keep changed** buttons to decide which version to keep.

<figure><img src="https://1940848424-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FLBGJKQic7BQYBXmVSjy0%2Fuploads%2FKwXN75C7HqIpYkXtkiTQ%2Fresolve-conflicts.jpg?alt=media&#x26;token=a0ec1bdd-5641-468d-878c-27f3962d73a1" alt=""><figcaption><p>GitBook will show you both the primary and the changed version of each block, so you can compare the two and choose which one to keep.</p></figcaption></figure>
{% endstep %}

{% step %}

### **Mark as resolved and merge**

Once you’ve resolved all the conflicts in your change request, you can hit **Mark as resolved** to confirm that you’ve updated all the issues. You can then merge your change request as normal by hitting the **Merge** button in the top-right corner of the screen.

<figure><img src="https://1940848424-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FLBGJKQic7BQYBXmVSjy0%2Fuploads%2FvtlGKAusvfoBwoezV6E3%2Fresolve-page.jpg?alt=media&#x26;token=655c95d9-9436-4abb-b250-e9d34f02d257" alt=""><figcaption><p>Once you’ve solved all of your merge conflicts, mark the whole page as resolved to finish the process. Now your content is ready to merge!</p></figcaption></figure>
{% endstep %}
{% endstepper %}