diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
index 60ac2b8e181..6208c044e4e 100644
--- a/src/test/unittest/unittest.sh
+++ b/src/test/unittest/unittest.sh
@@ -1478,13 +1478,8 @@ function require_valgrind() {
 
 	# Check if Valgrind is enabled in the test build
 	disable_exit_on_error
-<<<<<<< HEAD
 	../valgrind_check/valgrind_check
 	ret=$?
-=======
-	./valgrind_check/valgrind_check
-	local ret1=$?
->>>>>>> 51a2a049c (common: fix valgrind_check command path)
 	restore_exit_on_error
 	if [ $ret -ne 0 ]; then
 		msg=$(interactive_yellow STDOUT "SKIP:")