fixed conflicting pins