diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 77bc168a7..64a8c8236 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -162,12 +162,7 @@
 							<textarea id="tinymcePreview"></textarea>
 						</div>
 
-<<<<<<< Updated upstream
-					<?php echo $persons; ?>
-					<?php echo $prestudenten; ?>
-=======
 					<?php echo $recipients_ids; ?>
->>>>>>> Stashed changes
 					<?php echo $relationmessage_id; ?>
 					<?php echo $type; ?>