updated the library
new styles
fixed merge conflict