BASE64/LIBC: correct mismerge