Fix conflicts

Author: alejsdev

scripts/generate-client.sh

@@ -7,5 +7,5 @@ cd backend
 python -c "import app.main; import json; print(json.dumps(app.main.app.openapi()))" > ../openapi.json
 cd ..
 mv openapi.json frontend/
-cd frontend
-npm run generate-client
+npm run -w frontend generate-client
+npm run lint