diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20ac1296bf..a68132d358 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -173,10 +173,14 @@ set_target_properties( exiv2lib_int PROPERTIES
 )
 
 # NOTE: Cannot use target_link_libraries on OBJECT libraries with old versions of CMake
+<<<<<<< HEAD
 target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
 target_include_directories(exiv2lib SYSTEM PRIVATE
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
 )
+=======
+target_include_directories(exiv2lib SYSTEM PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>)
+>>>>>>> 81bc63d9c (CMake: Resolve Missing ZLIB Warning When PNG is Disabled)
 
 if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
     target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR})
@@ -229,9 +233,16 @@ else()
     target_link_libraries( exiv2lib PRIVATE psapi ws2_32 shell32 )
 endif()
 
+<<<<<<< HEAD
 if( EXIV2_ENABLE_PNG )
     target_link_libraries( exiv2lib PRIVATE ZLIB::ZLIB)
     list(APPEND requires_private_list "zlib")
+=======
+if(EXIV2_ENABLE_PNG)
+  target_link_libraries(exiv2lib PRIVATE ZLIB::ZLIB)
+  target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
+  list(APPEND requires_private_list "zlib")
+>>>>>>> 81bc63d9c (CMake: Resolve Missing ZLIB Warning When PNG is Disabled)
 endif()
 
 if( EXIV2_ENABLE_BMFF AND BROTLI_FOUND )