sure, do you want to fix it before the merge or should it be done in a separate commit?