From 788436b737c385e385a4d52c88643308e45be91e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 14:31:49 +0000
Subject: [PATCH] Update to X in STEP and README.md

---
 .github/steps/-step.txt |  2 +-
 README.md               | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt
index b8626c4..62d8fe9 100644
--- a/.github/steps/-step.txt
+++ b/.github/steps/-step.txt
@@ -1 +1 @@
-4
+X
diff --git a/README.md b/README.md
index 3331d51..407d118 100644
--- a/README.md
+++ b/README.md
@@ -14,24 +14,29 @@ _Learn why conflicts happen and how to resolve them._
 </header>
 
 <!--
-  <<< Author notes: Step 4 >>>
-  Start this step by acknowledging the previous step.
-  Define terms and link to docs.github.com.
+  <<< Author notes: Finish >>>
+  Review what we learned, ask for feedback, provide next steps.
 -->
 
-## Step 4: Merge your pull request
+## Finish
 
-_Almost there! :heart:_
+_Congratulations friend, you've completed this course!_
 
-You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
+<img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
 
-### :keyboard: Activity: Merge your pull request
+Here's a recap of all the tasks you've accomplished in your repository:
 
-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. 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.
+- You learned why merge conflicts happen.
+- You resolved a simple merge conflict.
+- You created a merge conflict, and resolved it!
+
+### What's next?
+
+- Make your own Markdown resume site with GitHub Pages! Learn how in our [GitHub Pages](https://github.com/skills/github-pages) course.
+- We'd love to hear what you thought of this course [in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts).
+- [Take another GitHub Skills course](https://github.com/skills).
+- [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started).
+- To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).
 
 <footer>