We can just wait until the other pull request is merged before resolving this, right?