diff --git a/client/package.json b/client/package.json
index ea6cddb..8666bfb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -20,11 +20,7 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-<<<<<<< HEAD
     "start": "react-scripts start --openssl-legacy-provider start",
-=======
-    "start": "react-scripts start",
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
@@ -47,9 +43,5 @@
       "last 1 safari version"
     ]
   },
-<<<<<<< HEAD
   "proxy":"http://localhost:5000"
-=======
-  "proxy":"http://localhost:5000/"
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
 }