diff --git a/main.tex b/main.tex
index 9f78513..e0b2a92 100644
--- a/main.tex
+++ b/main.tex
@@ -74,12 +74,8 @@ Martijn Remmen
     \input{chapters/4 - kwaliteit.tex}
     \input{chapters/5 - organisatie.tex}
     \input{chapters/6 - projectgrenzen.tex}
-<<<<<<< HEAD
-    \input{chapters/7 - planning.tex}
-=======
     \input{chapters/7 - risicoanalyse.tex}
     \input{chapters/8 - planning.tex}
->>>>>>> wip
     
     \printbibliography