Fix merge conflict after renaming of setup-codec anchor