diff --git a/docs/source/guides/logging.rst b/docs/source/guides/logging.rst
index 44cd694341e..2eccd9d8f47 100644
--- a/docs/source/guides/logging.rst
+++ b/docs/source/guides/logging.rst
@@ -109,6 +109,11 @@ hexadecimal format, consistent with opentelemetry logging instrumentation.
 
     logging:
       formatting:
+<<<<<<< HEAD
+=======
+        format: "%(asctime)s %(levelname_bracketed)s %(component)s %(message)s%(trace_msg)s"
+        datefmt: "%Y-%m-%dT%H:%M:%S%z"
+>>>>>>> 57805c3c (add docs)
         trace_id_format: 032x
         span_id_format: 016x