Merge editor creates extra conflicts

[OliverJAsh]

Does this issue occur when all extensions are disabled?: Yes/No

• VS Code Version: 1.96.4
• OS Version:

If I open the file directly, there is only 1 merge conflict:

import * as LandingPageEntity from "app/state/entities/landingPages/types";
<<<<<<< HEAD
import * as Route from "app/types/route";
import type * as UAPI from "domain/gen/unsplash";
import { Array, constant, flow, pipe } from "lib";
||||||| parent of 70a8afd (C)
import * as Route from "app/types/route";
import { Array, constant, flow, pipe } from "lib";
=======
import { constant, pipe } from "lib";
>>>>>>> 70a8afd (C)
import * as O from "shared/facades/Option";
import * as Sum from "shared/facades/Sum";

export const legacyLandingPageToSearchQuery = (
  landingPage: LandingPageEntity.Basic
): string => "foo";

export const landingPageToSearchQuery = (
  landingPage: UAPI.components["schemas"]["LandingPage.Full"]
): string => "bar";

However, when I open the file in the merge editor, there are 3 conflicts.

2 of the 3 conflicts are missing buttons to accept changes, making it seemingly impossible to resolve the conflict.

Here's the merge editor state as JSON:

{
    "languageId": "typescript",
    "base": "import * as LandingPageRouting from \"app/routes/Explore/LandingPage/routing\";\nimport * as LandingPageEntity from \"app/state/entities/landingPages/types\";\nimport * as Route from \"app/types/route\";\nimport { Array, constant, flow, pipe } from \"lib\";\nimport * as O from \"shared/facades/Option\";\nimport * as Sum from \"shared/facades/Sum\";\nimport * as Lang from \"./lang\";\n\ntype PageWithRouteData = { title: string; routeData: Route.Data.Union };\nexport const getPromotedLandingPages = 1;\n\nexport const getSearchQuery = (landingPage: LandingPageEntity.Basic): string =>\n  \"foo\";\n",
    "input1": "import * as LandingPageRouting from \"app/routes/Explore/LandingPage/routing\";\nimport * as LandingPageEntity from \"app/state/entities/landingPages/types\";\nimport * as Route from \"app/types/route\";\nimport type * as UAPI from \"domain/gen/unsplash\";\nimport { Array, constant, flow, pipe } from \"lib\";\nimport * as O from \"shared/facades/Option\";\nimport * as Sum from \"shared/facades/Sum\";\nimport * as Lang from \"./lang\";\n\ntype PageWithRouteData = { title: string; routeData: Route.Data.Union };\nexport const getPromotedLandingPages = 1;\n\nexport const legacyLandingPageToSearchQuery = (\n  landingPage: LandingPageEntity.Basic\n): string => \"foo\";\n\nexport const landingPageToSearchQuery = (\n  landingPage: UAPI.components[\"schemas\"][\"LandingPage.Full\"]\n): string => \"bar\";\n",
    "input2": "import * as LandingPageEntity from \"app/state/entities/landingPages/types\";\nimport { constant, pipe } from \"lib\";\nimport * as O from \"shared/facades/Option\";\nimport * as Sum from \"shared/facades/Sum\";\n\nexport const getSearchQuery = (landingPage: LandingPageEntity.Basic): string =>\n  \"foo\";\n",
    "result": "import * as LandingPageEntity from \"app/state/entities/landingPages/types\";\nimport * as Route from \"app/types/route\";\nimport { Array, constant, flow, pipe } from \"lib\";\nimport * as O from \"shared/facades/Option\";\nimport * as Sum from \"shared/facades/Sum\";\n\nexport const legacyLandingPageToSearchQuery = (\n  landingPage: LandingPageEntity.Basic\n): string => \"foo\";\n\nexport const landingPageToSearchQuery = (\n  landingPage: UAPI.components[\"schemas\"][\"LandingPage.Full\"]\n): string => \"bar\";\n",
    "initialResult": "import * as LandingPageEntity from \"app/state/entities/landingPages/types\";\n<<<<<<< HEAD\nimport * as Route from \"app/types/route\";\nimport type * as UAPI from \"domain/gen/unsplash\";\nimport { Array, constant, flow, pipe } from \"lib\";\n||||||| parent of 70a8afd (C)\nimport * as Route from \"app/types/route\";\nimport { Array, constant, flow, pipe } from \"lib\";\n=======\nimport { constant, pipe } from \"lib\";\n>>>>>>> 70a8afd (C)\nimport * as O from \"shared/facades/Option\";\nimport * as Sum from \"shared/facades/Sum\";\n\nexport const legacyLandingPageToSearchQuery = (\n  landingPage: LandingPageEntity.Basic\n): string => \"foo\";\n\nexport const landingPageToSearchQuery = (\n  landingPage: UAPI.components[\"schemas\"][\"LandingPage.Full\"]\n): string => \"bar\";\n"
}