fix merge conflict

Author: BenBagBag

1-Authentication/1-sign-in-react/SPA/package-lock.json

@@ -15,7 +15,7 @@
     },
     "devDependencies": {
         "@babel/plugin-transform-private-property-in-object": "^7.24.7",
-        "react-scripts": "5.0.1"
+        "react-scripts": "^5.0.1"
     },
     "scripts": {
         "start": "react-scripts start",

1-Authentication/1-sign-in-react/SPA/package.json

@@ -15,7 +15,7 @@ export const msalConfig = {
     auth: {
         clientId: 'Enter_the_Application_Id_Here', // This is the ONLY mandatory field that you need to supply.
         authority: 'https://Enter_the_Tenant_Subdomain_Here.ciamlogin.com/', // Replace the placeholder with your tenant subdomain 
-        redirectUri: '/', // Points to window.location.origin. You must register this URI on Azure Portal/App Registration.
+        redirectUri: 'http://localhost:3000/redirect', // Points to window.location.origin. You must register this URI on Azure Portal/App Registration.
         postLogoutRedirectUri: '/', // Indicates the page to navigate after logout.
         navigateToLoginRequestUrl: false, // If "true", will navigate back to the original request location before processing the auth code response.
     },