The merge in e64d5bcc6 (Merge branch 'bugfix', 2021-09-25) left several unresolved conflicts. One was cleaned up later in db67c7e92 (Move some ob-*el files to the new org-contrib repo, 2021-09-26). Take care of the other ones.
e64d5bcc6
db67c7e92