diff --git a/CMakeLists.txt b/CMakeLists.txt
index 367b784..1406959 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,12 +75,15 @@ foreach(TARGET ${POUND_PROJECT_TARGETS})
     )
 
     # Set Compile time log level for all targets.
+<<<<<<< HEAD
     # 1: Trace
     # 2: Debug
     # 3: Info
     # 4: Warning
     # 5: Error
     # 6: Fatal
+=======
+>>>>>>> 84fdedb (common: Implement logging framework)
     target_compile_definitions(${TARGET} PRIVATE COMPILE_TIME_LOG_LEVEL=1)
 endforeach()