chore: fixes

Author: Vinyl-Davyl

package.json

@@ -29,10 +29,7 @@
     "react-dom": "^18.2.0",
     "react-dropdown": "^1.11.0",
     "regenerator-runtime": "^0.13.11",
-<<<<<<< HEAD
-=======
     "semantic-ui-css": "^2.5.0",
->>>>>>> b0f9eb8584be0e95325cc30fd6d812469ec11d19
     "semantic-ui-react": "^2.1.5",
     "ts-debounce": "^4.0.0",
     "zustand": "^4.3.9"