diff --git a/application/controllers/monpas/Pdfmaker.php b/application/controllers/monpas/Pdfmaker.php
index 2d3533d..02c0bb2 100644
--- a/application/controllers/monpas/Pdfmaker.php
+++ b/application/controllers/monpas/Pdfmaker.php
@@ -23,9 +23,9 @@ class  Pdfmaker extends MY_Controller{
         $inputstring	= $this->input->post('data');
         $input			= json_decode($inputstring);
         $inhoud         = $input->pagina;
-<<<<<<< HEAD
+
         $titel          = $input->titel;
-=======
+
         $schooljaar     = $input->titel;
         $orgsoort       = $input->orgsoort;
         //maak goede titel
@@ -39,7 +39,7 @@ class  Pdfmaker extends MY_Controller{
             default : $profiel = 'SOP';
         }
         $soptitel = 'Compact '.$profiel. ' ' . $schooljaar;
->>>>>>> zarchief/headersop
+
         $schoolid       = $input->schoolid;
         $schooljaarnummer   = $input->schooljaarnr;
         $organisatie        = $this->Organisaties_model->get(['id' => $schoolid],false, true);