diff --git a/python/docs/make.bat b/python/docs/make.bat
index da9fcbe5dd3af..eb70913bf8c14 100644
--- a/python/docs/make.bat
+++ b/python/docs/make.bat
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 @ECHO OFF
 
 REM Command file for Sphinx documentation