# Merge Conflict
**Notice:**This extension is bundled with VisualStudioCode. It can be disabled but not uninstalled.
## FeaturesSee [MergeConflictsinVSCode](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.