diff --git a/xpathSearch.py b/xpathSearch.py
index 02b20b3..50930a0 100644
--- a/xpathSearch.py
+++ b/xpathSearch.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> 9087d9e0d889fe84a523f212108e31fa715c8aea
 from lxml import etree
 from difflib import SequenceMatcher
 import json