---
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:
  - /articles/addressing-merge-conflicts
versions:
  free-pro-team: '*'
  enterprise-server: '*'
  github-ae: '*'
topics:
  - Pull requests
children:
  - /about-merge-conflicts
  - /resolving-a-merge-conflict-on-github
  - /resolving-a-merge-conflict-using-the-command-line
---