And solved another merge conflict I missed...