Merging library changes