Updated lib
Conflict resolved