diff --git a/src/chat/src/chat_types.ts b/src/chat/src/chat_types.ts
index d7306cd..ae26cbc 100644
--- a/src/chat/src/chat_types.ts
+++ b/src/chat/src/chat_types.ts
@@ -32,7 +32,6 @@ export type ClientProfil = {
     innerHtml?: string,
 
 };
-<<<<<<< HEAD
 
 
 export type obj =
@@ -49,5 +48,3 @@ export type obj =
 	SenderWindowID: string,
 	Sendertext: string,
 };
-=======
->>>>>>> refs/remotes/origin/nigel/functionBlockMessage