diff --git a/tests/integration/test_integration_all_rust.py b/tests/integration/test_integration_all_rust.py
index 997a4206c..fd2a08c99 100644
--- a/tests/integration/test_integration_all_rust.py
+++ b/tests/integration/test_integration_all_rust.py
@@ -480,12 +480,8 @@ def _get_vapid(
 
 
 def enqueue_output(out, queue):
-<<<<<<< HEAD
-    for line in iter(out.readline, ""):
-=======
     """Add lines from the out buffer to the provided queue."""
-    for line in iter(out.readline, b""):
->>>>>>> f775454 (review comments for clearer test functions)
+    for line in iter(out.readline, ""):
         queue.put(line)
     out.close()