Fix a duplicate declaration which is probably just a merge error.