Log Message:
autoconf213: add to $CONFLICTS instead of overwriting it

I doubt this would impact anyone given how old both of those conflicts
entries are, but fix anyway.