[scalar-docs]

The latest generated output on scalar-generated conflicts with the custom code on scalar-next (build 1dMpFRycuDAJmF0C4opDV).

1 file conflicted — the regenerated output and your edits on scalar-next changed overlapping regions (an edit next to a regenerated line is enough to collide):

• pyproject.toml — 2 conflicts

  <<<<<<< HEAD
    { name = "Gumlet", email = "support@gumlet.com"},
  =======
    { name = "Gumlet", email = "support@gumlet.com" },
  >>>>>>> 7fb00956027766eae9444d696704f18f6fa4acdf
  

Resolve the conflicts here, then merge this PR into scalar-next. You can also resolve it locally: git fetch && git checkout scalar-merge-conflict--build--1dMpFRycuDAJmF0C4opDV && git merge origin/scalar-next. The platform will not touch this branch while your resolution is in progress.

Warning

Do not squash or rebase this PR — merge it with "Create a merge commit".
Squashing drops the merge ancestry, so the next generation re-conflicts on the very lines you just resolved. If Squash and merge is the only button offered, turn on "Allow merge commits" under Settings → General → Pull Requests first.
The platform detects and repairs a squashed resolution on the next generation, but that is a fallback, not a substitute.