diff --git a/src/test/unittest/valgrind.py b/src/test/unittest/valgrind.py
index f272946cd7c..f2d4a4bcfdd 100644
--- a/src/test/unittest/valgrind.py
+++ b/src/test/unittest/valgrind.py
@@ -201,11 +201,7 @@ def _get_valgrind_exe(self, force_enable):
                 raise futils.Skip('Valgrind not found')
 
         try:
-<<<<<<< HEAD
             _ = sp.check_output('../valgrind_check/valgrind_check',
-=======
-            out = sp.check_output('./valgrind_check/valgrind_check',
->>>>>>> 51a2a049c (common: fix valgrind_check command path)
                                   shell=True, universal_newlines=True,
                                   stderr=sp.STDOUT)
         except sp.CalledProcessError: