Add lib as a branch and use subtree merging