Index: doc/theses/mubeen_zulfiqar_MMath/allocator.tex
===================================================================
--- doc/theses/mubeen_zulfiqar_MMath/allocator.tex	(revision 2e9b59be1a4f6206dcfcb10cb3b400d3a5948c6c)
+++ doc/theses/mubeen_zulfiqar_MMath/allocator.tex	(revision 9e7236f4ea98982d55cddf21f808b612dbfe6ddf)
@@ -24,10 +24,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-<<<<<<< HEAD
-\section{Design choices for uHeap}\label{sec:allocatorSec}
-uHeap's design was reviewed and changed to fulfill new requirements (FIX ME: cite allocator philosophy). For this purpose, following two designs of uHeapLmm were proposed:
-=======
 \section{Design Choices}
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 
 llheap's design was reviewed and changed multiple times throughout the thesis.
@@ -253,14 +248,8 @@
 \begin{figure}
 \centering
-<<<<<<< HEAD
-\includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
-\caption{uHeap Structure}
-\label{fig:heapStructureFig}
-=======
 % \includegraphics[width=0.65\textwidth]{figures/NewHeapStructure.eps}
 \input{llheap}
 \caption{llheap Structure}
 \label{f:llheapStructure}
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 \end{figure}
 
@@ -342,13 +331,4 @@
 \end{algorithm}
 
-<<<<<<< HEAD
-Algorithm~\ref{alg:heapObjectFreeOwn} shows how a free request is fulfilled if object ownership is turned on. Algorithm~\ref{alg:heapObjectFreeNoOwn} shows how the same free request is fulfilled without object ownership.
-
-\begin{algorithm}
-\caption{Dynamic object free at address A with object ownership}\label{alg:heapObjectFreeOwn}
-\begin{algorithmic}[1]
-\If {$\textit{A was mmap-ed}$}
-	\State $\text{return A's dynamic memory to system using system call munmap}$
-=======
 \vspace*{-15pt}
 \begin{algorithm}[H]
@@ -358,5 +338,4 @@
 \If {$\textit{A mapped allocation}$}
 	\State $\text{return A's dynamic memory to system using system call \lstinline{munmap}}$
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 \Else
 	\State $\text{B} \gets \textit{O's owner}$
@@ -369,25 +348,4 @@
 \end{algorithmic}
 \end{algorithm}
-<<<<<<< HEAD
-
-\begin{algorithm}
-\caption{Dynamic object free at address A without object ownership}\label{alg:heapObjectFreeNoOwn}
-\begin{algorithmic}[1]
-\If {$\textit{A was mmap-ed}$}
-	\State $\text{return A's dynamic memory to system using system call munmap}$
-\Else
-	\State $\text{B} \gets \textit{O's owner}$
-	\If {$\textit{B is thread-local heap's bucket}$}
-		\State $\text{push A to B's free-list}$
-	\Else
-		\State $\text{C} \gets \textit{thread local heap's bucket with same size as B}$
-		\State $\text{push A to C's free-list}$
-	\EndIf
-\EndIf
-\end{algorithmic}
-\end{algorithm}
-
-=======
->>>>>>> bb7c77dc425e289ed60aa638529b3e5c7c3e4961
 
 \vspace*{-15pt}