Merge of its library and client