Issue: Merge Conflicts When Merging Testing Branch into Production on Replit

When I try to merge the testing branch into the main production branch, I get multiple conflicts, and Replit is unable to resolve them.

@zeshandhillon if you post some of the errors you are getting someone here might be able to help