t5801: fix an earlier mismerge