Library minor updates after conflict