Prevented type descriptions from being overwritten while merging

[glen-84]

Summary of the changes (Less than 80 chars)

• Prevented type descriptions from being overwritten while merging.

Closes #6787

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.34%. Comparing base (b521e35) to head (61e51d6).
Report is 4 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #7751   +/-   ##
=======================================
  Coverage   74.34%   74.34%           
=======================================
  Files        2860     2860           
  Lines      149841   149841           
  Branches    17411    17411           
=======================================
+ Hits       111395   111402    +7     
+ Misses      32647    32640    -7     
  Partials     5799     5799           

Flag	Coverage Δ
unittests	74.34% <ø> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

---

🚨 Try these New Features:

• Flaky Tests Detection - Detect and resolve failed and flaky tests
• JS Bundle Analysis - Avoid shipping oversized bundles