libheretic: Fix merge error