diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt
index 2bff5c38d..713bc26c6 100644
--- a/utils/dataconvert/CMakeLists.txt
+++ b/utils/dataconvert/CMakeLists.txt
@@ -10,9 +10,4 @@ add_library(dataconvert SHARED ${dataconvert_LIB_SRCS})
 
 set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
-<<<<<<< HEAD
 install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR})
-=======
-#install(TARGETS dataconvert DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
->>>>>>> 6bbb56b0091c6f90b74049e682009f3d1f57d45e
-