fixed Duplicate declaration errors