@@@ -1,3 -1,3 +1,4 @@@ merge context
 unchanged
-removed from parent 1
+added in result
