Merge Heritage Section Cleanly

[avnii-jain]

📋 Pull Request Template

📌 Description

✅ Related Issue

Closes #[Issue Number]

🛠️ Type of Change

Please delete options that are not relevant and check the box(es):

• Bug fix 🐛
• New feature ✨
• Code style update 🎨
• Refactoring 🔨
• Documentation update 📚
• Performance improvement ⚡
• Test addition ✅
• Other (please describe): __________

🧪 How Has This Been Tested?

• Locally
• Deployed preview
• Unit/Integration tests
• Not tested

🖼️ Screenshots / Videos (if applicable)

🧹 Code of Conduct

• I have followed the contribution guidelines.
• My code follows the project's code style.
• I have added tests or relevant documentation if necessary.
• I have linked the issue this PR solves.
• I ran npm run lint or npm run format if applicable.
• I have tested the code before raising the PR.

📎 Additional Context

---

🔗 Thank you for your contribution!

[avnii-jain]

@gaincyst Please Check

[gaincyst]

@avnii-jain Solve the conflicts

[avnii-jain]

@gaincyst Can you check once please. I have checked it already and done almost everything by my side.

[avnii-jain]

@gaincyst ?

[gaincyst]

@avnii-jain Its still not done..

[avnii-jain]

@gaincyst I tried a lot and unable to resolve it. Please help.

[gaincyst]

@avnii-jain I will also try to solve

[avnii-jain]

@gaincyst waiting for you. Any update?

[avnii-jain]

@gaincyst ??