diff --git a/scripts/Makefile b/scripts/Makefile
index a3e28cb..a992333 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -55,13 +55,8 @@ show-diff: nodejs/node_modules/remark nodejs/package.json $(SOURCEPATH) $(BUILD_
 .PHONY: check-references
 check-references: $(SOURCEPATH) $(BUILD_DIR) Makefile
 ## check references unique
-<<<<<<< HEAD
 	@rm -f $(BUILD_DIR)/$(SOURCEFILE).uniq
-	@grep -oP '(?<=<a name=")[^\"]+' $(SOURCEPATH) | uniq -d > $(BUILD_DIR)/$(SOURCEFILE).uniq
-=======
-	rm -f $(BUILD_DIR)/$(SOURCEFILE).uniq
 	@grep -oP '(?<=<a name=")[^\"]+' $(SOURCEPATH) | sort | uniq -d > $(BUILD_DIR)/$(SOURCEFILE).uniq
->>>>>>> 70d056f087b45f22bda925c9657eec5eaf7a45bf
 ## check if output has data
 	@if [ -s "build/CppCoreGuidelines.md.uniq" ]; then echo 'Found duplicate anchors:'; cat $(BUILD_DIR)/$(SOURCEFILE).uniq; false; fi
 
diff --git a/scripts/python/md-split.py b/scripts/python/md-split.py
index 3ef80e8..fb147e9 100755
--- a/scripts/python/md-split.py
+++ b/scripts/python/md-split.py
@@ -93,30 +93,17 @@ def process_code(read_filehandle, text_filehandle, line, linenum, sourcefile, co
         if comment_idx >= 0:
             no_comment_line = line[:comment_idx]
             text_filehandle.write(line[comment_idx + 2:])
-<<<<<<< HEAD
-
         if (not has_actual_code
             and not line.strip().startswith('//')
             and not line.strip().startswith('???')
-            and not line.strip() ==''):
+            and not line.strip() == ''):
             has_actual_code = True
-=======
-            if (not has_actual_code
-                    and not line.strip().startswith('//')
-                    and not line.strip().startswith('???')
-                    and not line.strip() == ''):
-                has_actual_code = True
->>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
         else:
             # write empty line so line numbers stay stable
             text_filehandle.write('\n')
 
         if (not line.strip() == '```'):
-<<<<<<< HEAD
             if ('???' == no_comment_line or '...' == no_comment_line):
-=======
-            if ('???' in no_comment_line or '...' in no_comment_line):
->>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
                 has_question_marks = True
             linebuffer.append(dedent(line) if not fenced else line)
         try:
@@ -127,12 +114,7 @@ def process_code(read_filehandle, text_filehandle, line, linenum, sourcefile, co
             break
     codefile = os.path.join(codedir, '%s%s.cpp' % (name, index))
     if fenced:
-<<<<<<< HEAD
-        text_filehandle.write('')
-=======
         text_filehandle.write('\n')
-
->>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
     if (has_actual_code and not has_question_marks):
         # add commonly used headers, so that lines can compile
         with io.open(codefile, 'w') as code_filehandle: