diff --git a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
index 343caf14426c1d648395210673e9e53ef2ecd6d9..96cfb2f44087a1dd1b5b08643c684627b8797aba 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
@@ -19,11 +19,6 @@ module LibHttp_XmlMessageBodyTypes {
     }
     
 } with {
-<<<<<<< Updated upstream
-  variant "";
-  encode "XML"
-=======
   encode "XML";
   variant ""
->>>>>>> Stashed changes
 } // End of LibHttp_XmlMessageBodyTypes