Solve the redefinition issue