reactjs code merge and bugfixes

Please see attached bug reports and local git code repo. The code has two important branches ("main" and "freelancer-230118-redo") which have different bugs as listed in the two bug reports. I need someone to create and deliver to me a new "bugfix branch" which will merge and resolve all bugs from both branches, without creating new bugs. In case of conflict between the two bug report documents, the latest one takes precedence.

The password for the zip file is freeLanc3r