@waifu @arcana The issue is btw that the db_utils.py file changed in the same place on both branches and since it's next to eachother, git got confused when trying to merge the changes made to the file.