[nymble]

This does not look like a merge error. The added line stands alone and it's very well located for an exploit.