Auto-merging conftest.py
CONFLICT (content): Merge conflict in conftest.py
Auto-merging tests/conftest.py
Auto-merging tests/observability/metrics/test_general_metrics.py
Auto-merging tests/observability/metrics/test_metrics.py
Auto-merging tests/observability/metrics/test_vms_metrics.py
Auto-merging utilities/hco.py
Auto-merging utilities/pytest_utils.py
Auto-merging utilities/unittests/test_pytest_utils.py
Automatic merge failed; fix conflicts and then commit the result.