The problem is the j1 and j2 repositories diverged, and need to turn the j1 repo into a stack of patches on top of j2, which isn't hard (it's like 5 patches) but then you need a config syste mto select which output to produce from the unified repo, and that's where we keep being too busy to sit down and work out what we want.