Update to 3 in STEP and README.md

.github/steps/-step.txt

@@ -1 +1 @@
-2
+3

README.md

@@ -14,31 +14,29 @@ _Learn why conflicts happen and how to resolve them._
 </header>
 
 <!--
-  <<< Author notes: Step 2 >>>
+  <<< Author notes: Step 3 >>>
   Start this step by acknowledging the previous step.
   Define terms and link to docs.github.com.
 -->
 
-## Step 2: Resolve a merge conflict
+## Step 3: Create your own conflict
 
-_Good start! Now let's look deeper at a merge conflict! :mag:_
+_Good job! You've solved a merge conflict! :tada:_
 
-This can be intimidating, but have no fear, Git is smart when it comes to merging! Git only needs a human to decide how to [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). Sometimes, the best way to resolve a merge conflict is to add content that's from both branches, or even something that isn't on either! This is why Git needs a human to look at the code and make the proper fixes.
+Resolving a conflict doesn't automatically merge the pull request in GitHub. Instead, it stores the resolution of the conflict in a merge commit and allows you and your team to keep working. To resolve a conflict, GitHub performs what is known as a _reverse merge_. This means that the changes from the `main` branch were merged into your `my-resume` branch. With a reverse merge, only the `my-resume` branch is updated. This allows you to test the resolved changes on your branch before you merge it into `main`.
 
-### :keyboard: Activity: Resolve a merge conflict
+Now, let's get a little evil. (It's for educational purposes!)
 
-1. Open the pull request that you just created, we created a conflict for you. Have no fear!
-1. At the bottom of the page, under "This branch has conflicts that must be resolved", click the **Resolve conflicts** button.
-1. Look for the highlighted sections that begins with `<<<<<<< my-resume` and ends with `>>>>>>> main`. These markers are added by Git to show you the content that is in conflict.
-1. Remove the changes made on the main branch by deleting all of the content below the `=======` and above `>>>>>>> main`.
-1. Next, remove the merge conflict markers by deleting the following lines:
-   ```
-   <<<<<<< my-resume
-   =======
-   >>>>>>> main
-   ```
-1. With the merge conflict markers removed, click **Mark as resolved**.
-1. Finally, click **Commit merge**.
+### :keyboard: Activity: Create your own conflict
+
+We went ahead and added a new file called `references.md` and pushed that change to `main`, without updating your `my-resume` branch.
+
+1. Browse to the `my-resume` branch.
+1. Click the `Add file` dropdown menu and then on `Create new file`.
+1. Create a file named `references.md`.
+1. Enter some text that conflicts with what we added for `references.md` in the `main` branch.
+1. Scroll to the bottom of the page and enter a commit message for your change.
+1. Click the **Commit new file** button, making sure the "Commit directly to the `my-resume` branch" option is selected.
 1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.
 
 <footer>