fixed conflicting info