copy-merging works afaict! -- some tests still broken: out-of-date