Awesome. That’ll solve the problem. That introduces a bit of busywork itself, to manually merge, but it doesn’t come up very often.
