Main conflicts were with:
* 97104b2 Use builtin list/dict/set/... types for annotations
* 4d069b8 Use str.removeprefix() and str.removesuffix()
* https://github.com/qutebrowser/qutebrowser/pull/8345 use dosctrings
for multiline strings in gherkin (still need to migrate the new tree
tabs test file)
Conflicts:
qutebrowser/browser/commands.py
qutebrowser/mainwindow/mainwindow.py
qutebrowser/mainwindow/tabbedbrowser.py
tests/end2end/features/conftest.py
tests/end2end/features/sessions.feature
079c58b593