Remove merge mess

Author: ZakarFin

package.json

@@ -18,11 +18,7 @@
   "license": "(MIT OR EUPL-1.1)",
   "main": "grunt.js",
   "engines": {
-<<<<<<< HEAD
-    "node": "^12.22.10 || ^14.17.0 || >=16.0.0",
-=======
     "node": ">=16.20.0",
->>>>>>> develop
     "npm": ">=6.0.0"
   },
   "scripts": {
@@ -37,18 +33,7 @@
     "postinstall": "node webpack/hacks/postinstall.js"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@ant-design/icons": "4.7.0",
-    "@babel/core": "7.19.6",
-    "@babel/preset-env": "7.19.4",
-    "@babel/preset-react": "7.18.6",
-    "@babel/runtime-corejs3": "7.20.0",
-    "@storybook/react": "6.3.7",
-    "antd": "4.24.8",
-    "babel-loader": "8.2.3",
-    "babel-plugin-styled-components": "2.0.5",
-=======
-    "@ant-design/icons": "4.6.3",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@babel/preset-react": "7.24.7",
@@ -61,7 +46,6 @@
     "antd": "4.24.8",
     "babel-loader": "8.3.0",
     "babel-plugin-styled-components": "2.1.4",
->>>>>>> develop
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "copy-webpack-plugin": "5.0.4",
     "core-js": "3.33.2",