diff --git a/Project/Sources/Classes/WPdocument.4dm b/Project/Sources/Classes/WPdocument.4dm
index 294f5c76..bb4b7cbf 100644
--- a/Project/Sources/Classes/WPdocument.4dm
+++ b/Project/Sources/Classes/WPdocument.4dm
@@ -190,13 +190,9 @@ Function getAttributes($attributeNames : Collection)->$attributes : Object  // c
 	End for each 
 	
 	
-<<<<<<< Updated upstream
-	//mark:-BODY
 	
-Function getBody()->$body : cs:C1710.WPelement
-=======
+	//mark:-BODY
 Function getBody()->$body : cs:C1710.WPelement  // ∆∆∆
->>>>>>> Stashed changes
 	$body:=cs:C1710.WPelement.new(WP Get body:C1516(This:C1470.document))