feat(hooks): hotfix merge and rebase