Wording tweaks from test run.

Author: chriswblake

.github/steps/1-step.md

@@ -2,7 +2,7 @@
 
 ### What is a merge conflict?
 
-A **merge conflict** occurs when changes are made to the same part of the same file on two different branches. You usually find out about conflicts in a pull request so let's start by creating one.
+A **merge conflict** occurs when changes are made to the same part of the same file on two different branches.
 
 ```mermaid
 gitGraph
@@ -34,11 +34,11 @@ gitGraph
 
 ### ⌨️ Activity: Create a pull request
 
-To quickly practice, we already created the above scenario for you by making a new branch `my-resume` then modifying `resume.md` on both branches, will will cause a conflict. Let's practice with it!
+To quickly practice, we already created the above scenario for you by making a new branch `my-resume` then modifying `resume.md` on both branches, which will will cause a conflict. Let's practice with it!
 
 1. Open this repo in a new browser tab, and work on the steps in your second tab while you read the instructions in this tab.
 
-1. In the top navigation, select the **Pull Requests** tab.
+1. In the top navigation, select the **Pull requests** tab.
 
 1. Click the **New pull request** button and use the following settings:
 

.github/steps/2-step.md

@@ -9,7 +9,7 @@ You typically have 3 options for managing a conflict:
 1. Manually combined the changes from both branches.
 
 > [!TIP]
-> You can learn more about managing conflicts with on the [GitHub Docs: resolve the conflict](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line) page.
+> You can learn more about managing conflicts on the [GitHub Docs: resolve the conflict](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line) page.
 
 ### When should I resolve a conflict?
 
@@ -46,7 +46,7 @@ gitGraph
 
 1. Open the recently created pull request.
 
-1. Scroll to the bottom of the page. Near the merge button, notice a message indicating there is a merge conflict.
+1. Scroll to the bottom of the page. Near the merge button, notice a message indicating there are conflicts to be resolved.
 
 1. Press the **Resolve conflicts** button to open a special text editor for handling merge conflicts.
 

.github/steps/3-step.md

@@ -1,11 +1,13 @@
 ## Step 3: Merge your pull request
 
-You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
+Nice work! All that is left is to merge!
+
+Yep, that's it! Merge conflicts can be easy! 🥰
 
 ### ⌨️ Activity: Merge your pull request
 
-1. First, resolve any remaining conflicts in your pull request.
-   > Look back at step one if you need help.
-1. Click **Merge pull request**.
-1. Delete the branch `my-resume` (optional).
-1. Now that your pull request is merged, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.
+1. Click the **Merge pull request** button.
+
+1. (optional) Delete the branch `my-resume`.
+
+1. With the pull request merged, Mona will share a final review then update the readme to share your success. Nice work! 😎

.github/workflows/0-start-exercise.yml

@@ -41,14 +41,14 @@ jobs:
           git config user.email github-actions[bot]@users.noreply.github.com
           echo "- Contributed to open source projects" >> resume.md
           git add resume.md
-          git commit -m "Add open source contribution"
+          git commit -m "Add open source experience"
           git push origin my-resume
 
           git checkout main
           git pull --rebase origin main
-          echo "- Built internal tools at Acme Corp" >> resume.md
+          echo "- Built internal tools" >> resume.md
           git add resume.md
-          git commit -m "Add Acme Corp experience"
+          git commit -m "Add internal experience"
           git push origin main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,14 +1,14 @@
-# Resolve merge conflicts
+# Resolve Merge Conflicts
 
 _Learn why conflicts happen and how to resolve them._
 
 ## Welcome
 
-Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.
+Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary.
 
-- **Who is this for**: New developers, new Git/GitHub users
+- **Who is this for**: New developers, new Git and GitHub users
 - **What you'll learn**: We'll introduce the tools for inspecting and resolving a merge conflict.
-- **What you'll build**: The reviewing of conflicting changes proposed to a simple Markdown.
+- **What you'll build**: You'll use a web editor to fix conflicting changes to Markdown file.
 - **Prerequisites**:
   - Skills Exercise: [Introduction to GitHub](https://github.com/skills-dev/introduction-to-github)
 - **How long**: less than 30 minutes

resume.md

@@ -20,4 +20,4 @@ Developed and maintained various conference talks, online training, and in-perso
 
 ### Leadership
 
-Managed multiple asynchronous teams in the development, maintenance, and release of various web applications and websites.
+Managed multiple asynchronous teams in the development, maintenance, and release of various web applications and websites.