muthu fix edits

1 files changed, 0 insertions, 9 deletions

diff --git a/problem.tex b/problem.tex
index a0a4419..8b1cb2b 100644
--- a/problem.tex
+++ b/problem.tex
@@ -108,19 +108,10 @@ c_{-i})$ implies $i\in f(c_i', c_{-i})$, and (b)
 %\end{enumerate}
 \end{lemma}
 \fussy
-<<<<<<< HEAD
 Myerson's Theorem
 % is particularly useful when designing a budget feasible truthful mechanism, as it 
 allows us to focus on designing a monotone allocation function. Then, the
 mechanism will be truthful as long as we give each agent her threshold payment---the caveat being that the latter need to sum to a value below $B$.
-=======
-Myerson's Theorem is particularly useful when designing a budget feasible truthful
-mechanism. One can focus on designing a monotone allocation function, and the
-resulting mechanism will be truthful as long as each agent is given her
-threshold payment---the caveat being that the latter need to sum to a value
-below $B$.
->>>>>>> c29302b25adf190f98019eb8ce5f79b10b66d54d
-
 \subsection{Budget Feasible Experimental Design}
 
 We approach the problem of optimal experimental design from the