diff --git a/changedetectionio/html_tools.py b/changedetectionio/html_tools.py
index 00fbb2b3..bd5fdb8f 100644
--- a/changedetectionio/html_tools.py
+++ b/changedetectionio/html_tools.py
@@ -398,12 +398,8 @@ def html_to_text(html_content: str, render_anchor_tag_content=False, is_rss=Fals
 # Does LD+JSON exist with a @type=='product' and a .price set anywhere?
 def has_ldjson_product_info(content):
     try:
-<<<<<<< HEAD
-        if 'application/ld+json' in content and content.count('"price"') == 1 and content.count('"priceCurrency"') == 1:
-=======
         lc = content.lower()
         if 'application/ld+json' in lc and lc.count('"price"') == 1 and '"pricecurrency"' in lc:
->>>>>>> master
             return True
 
 #       On some pages this is really terribly expensive when they dont really need it