Work done in library

I finally fixed the merge conflict.