RT Isidor Nikolic
We the @code team have decided to change back the default git conflict experience to be the inline editor. The reasoning behind this decision is here
Thanks for all the feedback!
https://github.com/microsoft/vscode/issues/160806

https://twitter.com/IsidorN/status/1569787519994150913