fixed conflicting declarations