diff -rN -u old-darcs-book/en/06-conflict-management.md new-darcs-book/en/06-conflict-management.md
--- old-darcs-book/en/06-conflict-management.md	2024-11-23 18:03:20.357402622 +0000
+++ new-darcs-book/en/06-conflict-management.md	2024-11-23 18:03:20.361402631 +0000
@@ -175,7 +175,7 @@
 ----------------
 
 When a conflict occurs `darcs` will mark these conflicts in our working tree.
-Remember that is checked for unrecorded changed in the working tree before
+Remember that we checked for unrecorded changed in the working tree before
 pulling in the changes? Let's check again.
 
 ```
@@ -231,7 +231,7 @@
 ```
 
 You can get rid of the conflict markers be simply issuing `darcs revert`,
-this does not solve your conflict but it takes you back to the state if the file
+this does not solve your conflict but it takes you back to the state of the file
 before the conflicting changes were applied. In our situation our `Main.hs`
 would look like this.