chore: fix merge conflicts

.github/workflows/do-update-authors.yml

@@ -40,6 +40,7 @@ jobs:
               "pre-commit-ci",
               "github-action",
               "GitHub Actions",
+              "Sourcery AI",
           )
           authors = [
               author
@@ -51,9 +52,7 @@ jobs:
           file_head = (
               ".. This file is automatically generated/updated by a github actions workflow.\n"
               ".. Every manual change will be overwritten on push to main.\n"
-              ".. You can find it here: ``.github/workflows/update-authors.yaml``\n"
-              ".. For more information see "
-              "`https://github.com/rstcheck/rstcheck/graphs/contributors`\n\n"
+              ".. You can find it here: ``.github/workflows/do-update-authors.yaml``\n\n"
               "Author\n"
               "------\n"
               "Steven Myint <git@stevenmyint.com>\n\n"

AUTHORS.rst

@@ -1,13 +1,33 @@
+.. This file is automatically generated/updated by a github actions workflow.
+.. Every manual change will be overwritten on push to main.
+.. You can find it here: ``.github/workflows/update-authors.yaml``
+.. For more information see `https://github.com/rstcheck/rstcheck/graphs/contributors`
+
 Author
 ------
-- Steven Myint (https://github.com/myint)
+Steven Myint <git@stevenmyint.com>
+
+Additional contributions by (sorted by name)
+--------------------------------------------
+- Alec Merdler <alecmerdler@gmail.com>
+- Alexander Biggs <akbiggs@users.noreply.github.com>
+- Alexander Kapshuna <kapsh@kap.sh>
+- Andrew Howe <howeaj@users.noreply.github.com>
+- Andy Hayden <andyhayden1@gmail.com>
+- Anthony Sottile <asottile@umich.edu>
+- Antoine Dechaume <AntoineD@users.noreply.github.com>
+- Asher Foa <asher@toolchain.com>
+- Doyle Rowland <doyle.rowland@reliaqual.com>
+- Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
+- Kapshuna Alexander <kapsh@kap.sh>
+- Lisha Li <65045844+lli-fincad@users.noreply.github.com>
+- Manuel Kaufmann <humitos@gmail.com>
+- Oliver Sieweke <oliver.sieweke@protonmail.com>
+- Paul Angerer <48882462+dabauxi@users.noreply.github.com>
+- Paul Angerer <48882462+etimoz@users.noreply.github.com>
+- Peter Boothe <pboothe@pboothe2.nyc.corp.google.com>
+- Sho Iwamoto <sho.iwamoto@pd.infn.it>
+- Swen Kooij <swenkooij@gmail.com>
+- happlebao <c.x.bao@student.ucc.ie>
+- serhiy-yevtushenko <syevtushenko@gmail.com>
 
-Contributors
-------------
-- Kapshuna Alexander (https://github.com/kapsh)
-- Cheng Xi Bao (https://github.com/happlebao)
-- Peter Boothe (https://github.com/pboothe)
-- Andy Hayden (https://github.com/hayd)
-- Manuel Kaufmann (https://github.com/humitos)
-- Doyle Rowland (https://github.com/weibullguy)
-- Serhiy Yevtushenko (https://github.com/serhiy-yevtushenko)