diff --git a/text/preliminaries/privacy.tex b/text/preliminaries/privacy.tex
index 4231cd0..c20be97 100644
--- a/text/preliminaries/privacy.tex
+++ b/text/preliminaries/privacy.tex
@@ -265,11 +265,7 @@ However, sum, max, and in some cases average
 % \kat{and average }
 queries can be problematic since a single (but outlier) value could change the output noticeably, making it necessary to add a lot of noise to the query's answer.
 
-<<<<<<< HEAD
-\kat{introduce and link to the previous text  the following definition}
-=======
 % \kat{introduce and link to the previous text  the following definition }
->>>>>>> 744bed7ac1bc6669742b970ea6f0f399200db538
 
 \begin{definition}
   [Query function sensitivity]
@@ -278,15 +274,6 @@ queries can be problematic since a single (but outlier) value could change the o
   $$\Delta f = \max_{D, D' \in \mathcal{D}} \lVert {f(D) - f(D')} \rVert_{1}$$
 \end{definition}
 
-<<<<<<< HEAD
-The pertinence \kat{pertinence to what?} of differential privacy methods is inseparable from the query's \kat{here, you need to associate a mechanism M to the query, because so far you have been talking for mechanisms} function sensitivity.
-The presence/absence of a single record can only change the result slightly\kat{do you want to say 'should' and not 'can'?}, and therefore differential privacy methods are best for low sensitivity queries such as counts.
-However, sum and max \kat{and average } queries can be problematic since a single (but outlier) value could change the output noticeably, making it necessary to add a lot of noise to the query's answer.
-\kat{How does the following connects to the query's sensitivity?}Furthermore, asking a series of queries may allow the disambiguation between possible data sets, making it necessary to add even more noise to the outputs.
-For this reason, after a series of queries exhausts the available privacy budget \kat{you have not talked about the sequential theorem, so this comes out of the blue} the data set has to be discarded.
-\kat{THe following is an explanation of the previous. When you restate sth in different words for explanation, please say that you do so, otherwise it is not clear what new you want to convey.}Keeping the original guarantee across multiple queries that return different/new answers \kat{why only different?even the same query multiple times would have the same results} requires the injection of noise proportional to the number of the executed queries, and thus destroying the utility of the output.
-=======
->>>>>>> 744bed7ac1bc6669742b970ea6f0f399200db538
 
 \paragraph{Privacy mechanisms}
 \label{subsec:prv-mech}