diff --git a/mypaper-final.tex b/mypaper-final.tex
index ae988ea4f5acaecc34433a0c2056090956e44a5b..6e98c162e5b0d1414ce991553cd11dd16baef5e8 100644
--- a/mypaper-final.tex
+++ b/mypaper-final.tex
@@ -128,13 +128,8 @@ relevance of the document-entity pair under consideration.
 We analyze how these factors (and the design choices made in their
 corresponding system components) affect filtering performance.
 We identify and characterize the relevant documents that do not pass
-<<<<<<< HEAD
-the filtering stage by examining their contents. This way, we give
-estimate of a practical upper-bound of recall for entity-centric stream
-=======
 the filtering stage by examing their contents. This way, we
 estimate a practical upper-bound of recall for entity-centric stream
->>>>>>> 68fbea2f0372ab9b4199b88f980dbf5e97f49063
 filtering.  
 
 \end{abstract}
