Work on a merging script is in progress here: https://gist.github.com/yrodiere/01075d72fb3c23963cd473055e287198