chore: fix rebase issues
2 files changed