Remove merge markers from comgr

Change-Id: I575e957ce2b8a1fe1fe472bc1f9af50332ec6639

Author: kzhuravl

amd/comgr/test/CMakeLists.txt

@@ -80,7 +80,7 @@ configure_file("source/source1.s" "source/source1.s" COPYONLY)
 configure_file("source/shared.cl" "source/shared.cl" COPYONLY)
 configure_file("source/source1.hip" "source/source1.hip" COPYONLY)
 configure_file("source/source2.hip" "source/source2.hip" COPYONLY)
-configure_file("source/name-expression.hip" "source/name-expression.hip" COPYONLY)
+configure_file("source/name-expression.hip" "source/name_expression.hip" COPYONLY)
 configure_file("source/rocm56slice.b" "source/rocm56slice.b" COPYONLY)
 configure_file("source/rocm57slice.b" "source/rocm57slice.b" COPYONLY)
 
@@ -175,11 +175,7 @@ add_comgr_test(symbolize_test c)
 add_comgr_test(mangled_names_test c)
 add_comgr_test(multithread_test cpp)
 add_comgr_test(name_expression_map_test c)
-<<<<<<< HEAD
-=======
-add_comgr_test(nested_kernel_test c)
 add_comgr_test(map_elf_virtual_address_test c)
->>>>>>> a999d61d45eb ([Comgr] New API to map ELF virtual address to code object offsets)
 
 # Test : Compile HIP tests only if HIP-Clang is installed.
 if (DEFINED HIP_COMPILER AND "${HIP_COMPILER}" STREQUAL "clang")