diff --git a/Makefile b/Makefile
index 7be62c7825..93f51a6ae7 100644
--- a/Makefile
+++ b/Makefile
@@ -677,7 +677,16 @@ cpplint:
 
 lint: jslint cpplint
 
+CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
 lint-ci: lint
+	@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
+		&& ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
+		exit 0 ; \
+	else \
+		echo "" >&2 ; \
+		echo "Conflict marker detected in one or more files. Please fix them first." >&2 ; \
+		exit 1 ; \
+	fi
 
 .PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
 	check uninstall install install-includes install-bin all staticlib \
diff --git a/vcbuild.bat b/vcbuild.bat
index 2f25e9a563..ee8468b300 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -342,7 +342,6 @@ goto jslint
 :jslint
 if not defined jslint goto exit
 echo running jslint
-<<<<<<< d1e2db2a13ddc9fb2f8cd1400b52656910d7374f
 %config%\node tools\eslint\bin\eslint.js benchmark lib src test tools --rulesdir tools\eslint-rules
 goto exit