| Current Path : C:/Program Files/Azure Data Studio/resources/app/extensions/merge-conflict/ |
| Current File : C:/Program Files/Azure Data Studio/resources/app/extensions/merge-conflict/README.md |
# Merge Conflict **Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled. ## Features See [Merge Conflicts](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.