diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a36ded63..146801ef 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -50,8 +50,4 @@ if(NOT MSVC)
     set_property(TEST tests_event_deadlock_reset PROPERTY ENVIRONMENT "ZE_ENABLE_NULL_DRIVER=1;ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_EVENTS_CHECKER=1")
     add_test(NAME tests_event_reset_reuse COMMAND tests --gtest_filter=*GivenLevelZeroLoaderPresentWhenCallingzeEventHostResetWithAlreadySignaledEventThenUsingEventAgainThenValidationLayerDoesNotPrintsWarningOfIllegalUsage*)
     set_property(TEST tests_event_reset_reuse PROPERTY ENVIRONMENT "ZE_ENABLE_NULL_DRIVER=1;ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_EVENTS_CHECKER=1")
-<<<<<<< HEAD
 endif()
-=======
-endif()
->>>>>>> 9ed07c2 (feature: events deadlock detection in validation layer)