resolved merge conflicts

package.json

@@ -30,7 +30,6 @@
     "@tanstack/react-query": "4.29.7",
     "@tanstack/react-table": "^8.9.1",
     "@trussworks/react-uswds": "^4.2.1",
-    "@types/react-select": "^5.0.1",
     "design-system-react": "cfpb/design-system-react",
     "immer": "^10.0.2",
     "keycloak-js": "^21.1.1",
@@ -61,7 +60,8 @@
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-dom": "5.3.3",
-    "@types/react-scroll": "^1",
+    "@types/react-scroll": "^1.8.7",
+    "@types/react-select": "^5.0.1",
     "@types/testing-library__jest-dom": "5.14.5",
     "@typescript-eslint/eslint-plugin": "^6.2.0",
     "@typescript-eslint/parser": "^6.2.0",

src/pages/ProfileForm/Step1Form.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable jsx-a11y/label-has-associated-control */
 /* eslint-disable react/jsx-props-no-spreading */
 import { zodResolver } from "@hookform/resolvers/zod";
+import useSblAuth from 'api/useSblAuth';
 import type { SubmitHandler } from "react-hook-form";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
@@ -16,7 +17,6 @@ import InputEntry from "./InputEntry";
 import { fiData } from './ProfileForm.data';
 import { formFields } from "./types";
 
-import useSblAuth from "api/useSblAuth";
 
 
 
@@ -55,7 +55,6 @@ const validationSchema = z
       .min(1, { message: "You should have associated financial institution information."})
   });
 
-
 type ValidationSchema = z.infer<typeof validationSchema>;
 
 function Step1Form(): JSX.Element {
@@ -159,8 +158,4 @@ function Step1Form(): JSX.Element {
   );
 }
 
-export default Step1Form;
-
-
-
-
+export default Step1Form;

yarn.lock

@@ -3542,7 +3542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-scroll@npm:^1":
+"@types/react-scroll@npm:^1.8.7":
   version: 1.8.7
   resolution: "@types/react-scroll@npm:1.8.7"
   dependencies:
@@ -4799,7 +4799,7 @@ __metadata:
     "@types/react": ^18.2.20
     "@types/react-dom": ^18.2.7
     "@types/react-router-dom": 5.3.3
-    "@types/react-scroll": ^1
+    "@types/react-scroll": ^1.8.7
     "@types/react-select": ^5.0.1
     "@types/testing-library__jest-dom": 5.14.5
     "@typescript-eslint/eslint-plugin": ^6.2.0