Fix up duplicate definition
Merge