For #271167
This makes it so our built-in extensions can mostly be built using `tsc` on the command line. Previously the extensions were picking up a lot of typing info from the root `node_modules` that meant they weren't truly independent
- 'better-merge' command and setting namespace replaced with 'merge-conflict'
- Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting