diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template
index e9a3f7a8e84..eeda77fd851 100755
--- a/conf/zeppelin-site.xml.template
+++ b/conf/zeppelin-site.xml.template
@@ -226,7 +226,6 @@
 </property>
 
 <property>
-<<<<<<< HEAD
   <name>zeppelin.send.mail.on.execution.error</name>
   <value>true</value>
   <description>Send email with details if any paragraph execution resulted in error</description>