# How to resolve merge conflicts in gitlab

> To resolve merge conflicts in GitLab, navigate to your merge requests, click resolve conflicts, and select either to use ours or theirs. Next, commit to the source branch, review any additional fields as needed, and finally click merge to complete the request.

Canonical: https://livedemo.ai/tutorials/how-to-resolve-merge-conflicts-in-gitlab/
Apps: GitLab
Updated: 2026-10-05
Interactive demo: https://story-api.livedemo.ai/workspaces/62255d3d3304f17b8f5e2d03/stories/692a4c8eab56e05a00ff8117/preview?step=1

## Steps

1. Log in to your GitLab account and navigate and select "Merge requests."
2. As you can see in this merge request there are conflicts. Click on "Resolve this conflicts."
3. Select "Use ours" or "Use theirs," depending on which version you want to keep for resolving the merge conflict.
4. Click "Commit to source branch."
5. Review the other fields as needed. When ready, click "Merge" to complete the merge request.