fix(database): resolve rebase issue
fix(deisctl): resolve rebase issue