---
title: Addressing merge conflicts
intro: 'If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request''s changes.'
redirect_from:
  - /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts
  - /articles/addressing-merge-conflicts
  - /github/collaborating-with-pull-requests/addressing-merge-conflicts
versions:
  fpt: '*'
  ghes: '*'
  ghec: '*'
topics:
  - Pull requests
children:
  - /about-merge-conflicts
  - /resolving-a-merge-conflict-on-github
  - /resolving-a-merge-conflict-using-the-command-line
shortTitle: Address merge conflicts
---