fix erroneous #if that occured during merge conflict resolution