DVC: Create merge conflict

Merged Jann-Niklas Zimmermann requested to merge dvc_conflict into main

Force a merge conflict with this merge request

Merge request reports