diff --git a/his_checker.py b/his_checker.py
index 9f2a17d..e86059a 100755
--- a/his_checker.py
+++ b/his_checker.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/python3
 
 # SPDX-License-Identifier: Apache-2.0
@@ -215,3 +216,7 @@ def process_v_g(files, threshold):
     # If there were any failures, exit with an error code
     if CHECK_FAIL:
         sys.exit(-1)
+=======
+
+# wip
+>>>>>>> 6e30066 (feat(HIS): add HIS script into makefile python scripts)