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