fix merge conflicts causing symbol lookup error