error: could not apply 3cd9caf2... [4.21] Remove DataSource storage class fallback from DV template helper (#5228)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


Auto-merging tests/conftest.py
Auto-merging tests/infrastructure/golden_images/test_common_templates_data_volumes.py
CONFLICT (content): Merge conflict in tests/infrastructure/golden_images/test_common_templates_data_volumes.py
Auto-merging tests/storage/conftest.py
Auto-merging utilities/storage.py
CONFLICT (content): Merge conflict in utilities/storage.py