diff --git a/lib/Service/TicketService.php b/lib/Service/TicketService.php
index 4f82622..d34bda5 100644
--- a/lib/Service/TicketService.php
+++ b/lib/Service/TicketService.php
@@ -106,7 +106,11 @@ class TicketService {
 			$title = array_get($matrixTicketContent, "title", "Untitled");
 			$description = array_get($matrixTicketContent, "description", "");
 			$lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom());
+<<<<<<< HEAD
 			$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen"); 
+=======
+			$matrixHelperUserName = array_get($matrixTicketContent, "matrixHelperUserName", "nicht zugewiesen"); 
+>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
 			$expirationDate = array_get($matrixTicketContent, "expiration date", "");
 			return array(
 				'ticketId' => $ticketId,
@@ -114,7 +118,11 @@ class TicketService {
 				'lastModified' => $lastModified,
 				'title' => $title,
 				'description' => $description,
+<<<<<<< HEAD
 				'matrixHelperUser' => $matrixHelperUser,
+=======
+				'matrixHelferName' => $matrixHelperUserName,
+>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
 				'expirationDate' => $expirationDate 
 			);
 		} catch (MatrixException | RoomNotFoundException $e) {