Wording tweaks from trial run

Author: chriswblake

.github/steps/1-step.md

@@ -28,8 +28,8 @@ gitGraph
 
 1. We start with a repository and add a `resume.md` file.
 2. We create a new branch called `my-resume` and update the skills area.
-3. At the same time, someone else updates the skills section on the `main` branch.
-4. We add more changes to the `my-resume` branch
+3. At the same time, someone else also updates the skills area on the `main` branch.
+4. We add other unrelated changes to the `my-resume` branch.
 5. When we try to merge `my-resume` into `main`, we get a **conflict!** Both branches modified the same part of `resume.md`.
 
 ### ⌨️ Activity: Create a pull request

.github/steps/2-step.md

@@ -38,13 +38,13 @@ gitGraph
     commit id: "Continue work"
 
     checkout main
-    merge my-resume id: "Successful!"
+    merge my-resume id: "Success!"
 
 ```
 
 ### ⌨️ Activity: Resolve a merge conflict
 
-1. Open the recently created pull request.
+1. If needed, open the recently created pull request.
 
 1. Scroll to the bottom of the page. Near the merge button, notice a message indicating there are conflicts to be resolved.
 
@@ -54,25 +54,25 @@ gitGraph
 
    ```txt
    <<<<<<< my-resume
-   (... compare branch version ...)
+   - Contributed to open source projects
    =======
-   (... base branch version ...)
+   - Built internal tools
    >>>>>>> main
    ```
 
 1. After some inspection, we decide to keep the version from the compare branch. Remove the base branch version by deleting then content between `=======` and `>>>>>>> main`.
 
    ```txt
    <<<<<<< my-resume
-   (... compare branch version ...)
+   - Contributed to open source projects
    =======
    >>>>>>> main
    ```
 
 1. With our manual changes finished, let's remove the merge conflict markers. Only the content from the compare branch will remain.
 
    ```txt
-   (... compare branch version ...)
+   - Contributed to open source projects
    ```
 
 1. In the top right, click the **Mark as resolved** button and choose **Commit merge**.

.github/steps/3-step.md

@@ -1,7 +1,6 @@
 ## Step 3: Merge your pull request
 
-Nice work! All that is left is to merge!
-
+Nice work! All that remains is to merge!
 Yep, that's it! Merge conflicts can be easy! 🥰
 
 ### ⌨️ Activity: Merge your pull request