diff --git a/package.json b/package.json
index 8ad90f1dc..e0021a6d5 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,14 @@
   },
   "scripts": {
     "account": "yarn hardhat:account",
+    "account:import": "yarn workspace @se-2/hardhat account:import",
+    "account:generate": "yarn workspace @se-2/hardhat account:generate",
     "chain": "yarn hardhat:chain",
     "compile": "yarn hardhat:compile",
     "deploy": "yarn hardhat:deploy",
     "fork": "yarn hardhat:fork",
     "format": "yarn next:format && yarn hardhat:format",
-    "generate": "yarn hardhat:generate",
+    "generate": "yarn account:generate",
     "hardhat:account": "yarn workspace @se-2/hardhat account",
     "hardhat:chain": "yarn workspace @se-2/hardhat chain",
     "hardhat:check-types": "yarn workspace @se-2/hardhat check-types",
diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
index 8e75e1b73..94e824092 100644
--- a/packages/hardhat/package.json
+++ b/packages/hardhat/package.json
@@ -3,22 +3,16 @@
   "version": "0.0.1",
   "scripts": {
     "account": "hardhat run scripts/listAccount.ts",
-    "account:import": "hardhat run scripts/importAccount.ts",
     "account:generate": "hardhat run scripts/generateAccount.ts",
+    "account:import": "hardhat run scripts/importAccount.ts",
     "chain": "hardhat node --network hardhat --no-deploy",
     "check-types": "tsc --noEmit --incremental",
     "compile": "hardhat compile",
-<<<<<<< HEAD
-
-    "fork": "MAINNET_FORKING_ENABLED=true hardhat node --network hardhat --no-deploy",
-    "generate": "yarn account:generate",
-=======
     "deploy": "ts-node scripts/runHardhatDeployWithPK.ts",
->>>>>>> 5a7efa7 (Sort lines also in packages/**/package.json)
     "flatten": "hardhat flatten",
     "fork": "MAINNET_FORKING_ENABLED=true hardhat node --network hardhat --no-deploy",
     "format": "prettier --write './**/*.(ts|sol)'",
-    "generate": "hardhat run scripts/generateAccount.ts",
+    "generate": "yarn account:generate",
     "hardhat-verify": "hardhat verify",
     "lint": "eslint --config ./.eslintrc.json --ignore-path ./.eslintignore ./*.ts ./deploy/**/*.ts ./scripts/**/*.ts ./test/**/*.ts",
     "lint-staged": "eslint --config ./.eslintrc.json --ignore-path ./.eslintignore",