diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27c4009f93ac8..822e4196adf5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -240,8 +240,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security
 
 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
-<<<<<<< HEAD
 [Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.12...2.x
-=======
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.x
->>>>>>> 37a5dd041f2 (Bump JNA version from 5.5 to 5.13.)
diff --git a/distribution/src/config/log4j2.properties b/distribution/src/config/log4j2.properties
index 87b875587952e..1f9935022c330 100644
--- a/distribution/src/config/log4j2.properties
+++ b/distribution/src/config/log4j2.properties
@@ -14,7 +14,7 @@ status = error
 appender.console.type = Console
 appender.console.name = console
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %style{[%d{ISO8601}]}{FG_Red BG_White} %highlight{[%-5p][%-25c{1.}]} %style{[%node_name]}{FG_Magenta BG_White} %style{<%t>}{bright green} %style{[%M]}{bright magenta} : %marker %style{%m}{FG_Black BG_Yellow}%n
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
 
 #[%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
 
@@ -67,7 +67,7 @@ appender.rolling_old.strategy.action.condition.nested_condition.type = IfAccumul
 appender.rolling_old.strategy.action.condition.nested_condition.exceeds = 2GB
 ################################################
 
-rootLogger.level = debug
+rootLogger.level = info
 rootLogger.appenderRef.console.ref = console
 rootLogger.appenderRef.rolling.ref = rolling
 rootLogger.appenderRef.rolling_old.ref = rolling_old