Fix linting issues in test files

- Fix line length in test_openai_models.py
- Remove unresolved merge conflict markers in test_oci_data_science.py

Author: fede-kamel

libs/oci/tests/integration_tests/chat_models/test_openai_models.py

@@ -32,7 +32,8 @@
 
 Run specific test:
 ```bash
-pytest tests/integration_tests/chat_models/test_openai_models.py::test_openai_basic_completion -v
+pytest tests/integration_tests/chat_models/test_openai_models.py \
+  ::test_openai_basic_completion -v
 ```
 """
 

libs/oci/tests/unit_tests/chat_models/test_oci_data_science.py

@@ -152,11 +152,7 @@ def test_stream_vllm(*args: Any) -> None:
         if output is None:
             output = chunk
         else:
-<<<<<<< HEAD
-            output = output + chunk
-=======
             output += chunk
->>>>>>> bb7ac7f (Fix mypy type errors for LangChain 1.x compatibility)
         count += 1
     # LangChain 1.x adds a final chunk with chunk_position='last', so we get 6 chunks
     assert count >= 5