I've successfully resolved the merge conflicts between my branch and the main branch, and everything appears to be functioning well at present.
However, there's a lingering bug that needs attention: an error occurs when refreshing the profile page or clicking on the 'settings' icon in the sidebar, which should navigate to the profile page. I'll prioritize addressing this issue promptly.
Apart from this bug, everything seems to be in order from my perspective. My branch is synchronized with the current version of the main branch, and all merge-related issues have been resolved in this pull request.
It's possible that I may have overlooked something while testing; If you find any issues, please let me know.
I've successfully resolved the merge conflicts between my branch and the main branch, and everything appears to be functioning well at present.
However, there's a lingering bug that needs attention: an error occurs when refreshing the profile page or clicking on the 'settings' icon in the sidebar, which should navigate to the profile page. I'll prioritize addressing this issue promptly.
Apart from this bug, everything seems to be in order from my perspective. My branch is synchronized with the current version of the main branch, and all merge-related issues have been resolved in this pull request.
It's possible that I may have overlooked something while testing; If you find any issues, please let me know.