@waifu @arcana I'm honestly kinda confused. It complains about a merge-conflict to master, but it doesn't make sense to me. Looks like some changes from master aren't in the PR branch.
Try git rebase main on the feature branch for that PR and see what git complains about in the bot/db_utils.py file. That will attempt to take your commits from the point your feature branch and master diverged, update your feature branch to newest master and readd your commits.