diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index 91c1ac34c3551..1738d3e96b420 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -79,9 +79,16 @@ public function readObject($urn) {
 			];
 
 			$context = stream_context_create($opts);
+<<<<<<< HEAD
             return fopen($request->getUri(), 'r', false, $context);
         });
     }
+=======
+
+			return fopen($request->getUri(), 'r', false, $context);
+		});
+	}
+>>>>>>> 23b43f02b58d5216b0dd596ad4ed9d39c95ce746
 
 	/**
 	 * @param string   $urn    the unified resource name used to identify the object