Add support for object deletion conflict resolution

[dirkkul]

No description provided.

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 90.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 94.38%. Comparing base (624e2e2) to head (e72ce95).
Report is 66 commits behind head on main.

Files with missing lines	Patch %	Lines
integration/test_collection_config.py	75.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1307      +/-   ##
==========================================
- Coverage   94.38%   94.38%   -0.01%     
==========================================
  Files         220      220              
  Lines       20953    20965      +12     
==========================================
+ Hits        19776    19787      +11     
- Misses       1177     1178       +1     

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