client-start branch appears to be broken after unintended merge of client-complete branch

[tsondergaard]

I tried following the instructions in https://github.blog/ai-and-ml/github-copilot/github-for-beginners-building-a-react-app-with-github-copilot/, but ran into an issue after running npm run dev and launching http://localhost:5173/ in the browser. Instead of getting the planventure page I get this error:

  VITE v6.1.1  ready in 220 ms

  ➜  Local:   http://localhost:5173/
  ➜  Network: use --host to expose
  ➜  press h + enter to show help
Error: The following dependencies are imported but could not be resolved:

  dayjs (imported by C:/vitaldev/planventure/planventure-client/src/components/itinerary/ItineraryDay.jsx)
  @mui/x-date-pickers/DatePicker (imported by C:/vitaldev/planventure/planventure-client/src/components/trips/EditTripForm.jsx)
  @mui/x-date-pickers/LocalizationProvider (imported by C:/vitaldev/planventure/planventure-client/src/components/trips/EditTripForm.jsx)
  @mui/x-date-pickers/AdapterDayjs (imported by C:/vitaldev/planventure/planventure-client/src/components/trips/EditTripForm.jsx)

Are they installed?
    at file:///C:/vitaldev/planventure/planventure-client/node_modules/vite/dist/node/chunks/dep-Cg8OuIew.js:19640:15
    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
    at async file:///C:/vitaldev/planventure/planventure-client/node_modules/vite/dist/node/chunks/dep-Cg8OuIew.js:52992:28

I believe the problem is that the newest commit in the branch is an incorrect merge of origin/client-complete into client-start:

git log --pretty=fuller -1
commit 94e4d805d7cf855771d9fa726d05b5b6d69ca93a (HEAD -> client-start, origin/client-start)
Merge: 214a03c b9c49cf
Author:     Kedasha Kerr <47188731+LadyKerr@users.noreply.github.com>
AuthorDate: Thu Apr 24 09:03:54 2025 -0500
Commit:     GitHub <noreply@github.com>
CommitDate: Thu Apr 24 09:03:54 2025 -0500

    Merge branch 'client-complete' into client-start

If I checkout the tip of client-start prior to this merge commit, 214a03c, then the planventure page is shown as expected at http://localhost:5173/.