FIX residual git messages in archives

package.json

@@ -28,20 +28,11 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     "@types/bcryptjs": "^3.0.0",
     "@types/express": "^4.17.21",
-=======
     "@types/express": "^5.0.0",
->>>>>>> f75e135 (Issue#1: ADD user schema)
-=======
     "@types/express": "^5.0.0",
->>>>>>> baa1360 ( consertado)
-=======
     "@types/express": "^5.0.0",
->>>>>>> a20601a32052cb95406df2e75d8114de3dc95e7b
     "@types/jsonwebtoken": "^9.0.9",
     "@types/node": "^22.13.9",
     "@types/pg": "^8.11.11",