ENH: Merge improvement

[pubpub-zz]

proposal to complete #2203

[pubpub-zz]

@Lucas-C
This is my proposal (still a few bug to be fixed). What do you think?

[codecov]

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (41ffc2c) 94.38% compared to head (d109532) 94.38%.
Report is 1 commits behind head on main.

❗ Current head d109532 differs from pull request most recent head cfd4bac. Consider uploading reports for the commit cfd4bac to get more accurate results

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2226   +/-   ##
=======================================
  Coverage   94.38%   94.38%           
=======================================
  Files          43       43           
  Lines        7591     7591           
  Branches     1498     1498           
=======================================
  Hits         7165     7165           
  Misses        262      262           
  Partials      164      164           

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