yeah - merging has been tricky to nail down, definitely the thing that's gone through the most iterations so far
I would love to know more about it! you should make a blog post
it's been a learning experience for sure, but my blog is really not a good place for a technical story like this. i'll think about where i might be able to post it