fix another bad rebase