Fix: resolve merge conflict of dev to main sync

[anishpawaskar]

Developer Name: @anishpawaskar

---

Description

Resolve merge conflict of dev to main sync

Breaking Changes

• [ ] Yes
• [x] No

Development Tested?

• [x] Yes
• [ ] No

Database Changes

• [ ] Yes
• [x] No

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated (UTC)
members-app-v1	✅ Ready (Inspect)	Visit Preview	Dec 1, 2023 3:57pm