updated exercise to put proper step1 for resolve merge conflict

Author: Chukslord1

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

@@ -20,11 +20,11 @@ jobs:
     name: Start Exercise
     uses: skills/exercise-toolkit/.github/workflows/[email protected]
     with:
-      exercise-title: "Review Pull Requests"
-      intro-message: "Let's learn to collaborate with others using pull requests."
+      exercise-title: "Resolve Merge Conflicts"
+      intro-message: "Let's learn how to resolve merge conflicts when collaborating on GitHub."
 
-  modify_repo_content:
-    name: Modify repo content
+  prepare_merge_conflict:
+    name: Prepare merge conflict
     runs-on: ubuntu-latest
     needs: [start_exercise]
     env:
@@ -33,25 +33,24 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Prepare a branch and pull request
+      - name: Simulate conflict between main and my-resume
         run: |
-
-          echo "Make a branch"
-          BRANCH=update-game
-          git checkout -b $BRANCH
-
-          echo "Update index.html"
-          sed -i.bak 's/Game over/Game over, refresh to play again 🧑‍💻 🤖!/' index.html
-
-          echo "Make a commit"
+          git checkout -b my-resume
           git config user.name github-actions[bot]
           git config user.email github-actions[bot]@users.noreply.github.com
-          git add index.html index.html.bak
-          git commit --message="Update game over message"
-
-          echo "Push"
-          git push --set-upstream origin $BRANCH
+          sed -i 's/1/2/' .github/steps/-step.txt
+          git add .github/steps/-step.txt
+          git commit -m "Update step in my-resume"
+          git push origin my-resume
+
+          git checkout main
+          sed -i 's/Experience/Jobs/' resume.md
+          git add resume.md
+          git commit -m "Update resume.md in main"
+          git push origin main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -73,22 +72,12 @@ jobs:
           path: exercise-toolkit
           ref: v0.5.0
 
-      - name: Build comment - add step content
-        id: build-comment
-        uses: skills/action-text-variables@v2
-        with:
-          template-file: ${{ env.STEP_1_FILE }}
-          template-vars: |
-            login: ${{ github.actor }}
-            full_repo_name: ${{ github.repository }}
-
       - name: Create comment - add step content
         run: |
           gh issue comment "$ISSUE_URL" \
-            --body "$ISSUE_BODY"
+            --body-file "$STEP_1_FILE"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE_BODY: ${{ steps.build-comment.outputs.updated-text }}
 
       - name: Create comment - watching for progress
         run: |