Merge All Branches, Resolve Conflicts, and Ensure Completeness

Description:

We need to merge all active branches into the main branch to consolidate the latest changes. During this process, it is crucial to resolve any conflicts that arise. Additionally, please review the code thoroughly to ensure that nothing is missing or overlooked.

Tasks:

• Merge all active branches into the main branch.
• Carefully resolve any merge conflicts.
• Review the merged code to identify and fill in any missing pieces or incomplete features.