Fix redeclaration error