Update readme with subtree instructions
Resolve merge conflict in README