add library
fix conflict