Upgrade library and build
Upgrade library and build
conflict resolution