fix(*): resolve store rebase issues