@thisismissem If your PR addresses problems his PR won't, is it possible to restructure your PR in a way it improves things without causing conflict, on top of his changes? (It will probably be more work to do so, so if you don't want to do that, I think that's fair, though.)