diff --git a/lifecycle_modelling/paper.tex b/lifecycle_modelling/paper.tex
index 098cc92..587e485 100644
--- a/lifecycle_modelling/paper.tex
+++ b/lifecycle_modelling/paper.tex
@@ -21,15 +21,9 @@
                                               % numbers at outer edges
 \pagenumbering{arabic}                        % Arabic page numbers hereafter
 \author{R.P.Clark}
-<<<<<<< HEAD
-\title{FMMD Lifecycle Modelling}
-\maketitle 
-\input{lifecycle_modelling}
-=======
 \title{Product Lifecycle Modelling with FMMD}
 \maketitle 
 \input{lifecycle_modelling_paper}
->>>>>>> 53352f41d87e0db41a23770a5da443a9345b982e
 
 \bibliographystyle{plain}
 \bibliography{../vmgbibliography,../mybib}