src/lib conflict fixed