tibor
diff --git a/‎_data/ui-text.yml
+2 b/‎_data/ui-text.yml
+2
diff --git a/‎_layouts/simple-class.html
+4-1 b/‎_layouts/simple-class.html
+4-1
diff --git a/‎index.html
+1-6 b/‎index.html
+1-6
diff --git a/‎paths/electron/distributing/01-share-apps.md
+1 b/‎paths/electron/distributing/01-share-apps.md
+1
diff --git a/‎paths/electron/distributing/02-native-app-discovery.md
+1 b/‎paths/electron/distributing/02-native-app-discovery.md
+1
diff --git a/‎paths/electron/distributing/03-sharing-on-websites.md
+1 b/‎paths/electron/distributing/03-sharing-on-websites.md
+1
diff --git a/‎paths/electron/distributing/04-celebrate.md
+1 b/‎paths/electron/distributing/04-celebrate.md
+1
diff --git a/‎paths/electron/packaging-apps/01-packaging-electron.md
+1 b/‎paths/electron/packaging-apps/01-packaging-electron.md
+1
diff --git a/‎paths/electron/packaging-apps/02-using-electron-packager.md
+1 b/‎paths/electron/packaging-apps/02-using-electron-packager.md
+1
diff --git a/‎paths/electron/packaging-apps/03-adding-an-icon.md
+1 b/‎paths/electron/packaging-apps/03-adding-an-icon.md
+1
diff --git a/‎paths/electron/packaging-apps/04-testing.md
+1 b/‎paths/electron/packaging-apps/04-testing.md
+1
diff --git a/‎paths/electron/packaging-apps/05-celebrate.md
+1 b/‎paths/electron/packaging-apps/05-celebrate.md
+1
diff --git a/‎paths/electron/starting-with-electron/01-getting-started.md
+1 b/‎paths/electron/starting-with-electron/01-getting-started.md
+1
diff --git a/‎paths/electron/starting-with-electron/02-electron-boilerplate.md
+1 b/‎paths/electron/starting-with-electron/02-electron-boilerplate.md
+1
diff --git a/‎paths/electron/starting-with-electron/03-git-repository.md
+1 b/‎paths/electron/starting-with-electron/03-git-repository.md
+1
diff --git a/‎paths/electron/starting-with-electron/04-creating-app-files.md
+1 b/‎paths/electron/starting-with-electron/04-creating-app-files.md
+1
diff --git a/‎paths/electron/starting-with-electron/05-running-the-app.md
+1 b/‎paths/electron/starting-with-electron/05-running-the-app.md
+1
diff --git a/‎paths/electron/starting-with-electron/06-add-to-index.md
+1 b/‎paths/electron/starting-with-electron/06-add-to-index.md
+1
diff --git a/‎paths/electron/starting-with-electron/07-add-to-css.md
+1 b/‎paths/electron/starting-with-electron/07-add-to-css.md
+1
diff --git a/‎paths/electron/starting-with-electron/08-add-to-js.md
+1 b/‎paths/electron/starting-with-electron/08-add-to-js.md
+1
diff --git a/‎paths/electron/starting-with-electron/09-celebrate.md
+1 b/‎paths/electron/starting-with-electron/09-celebrate.md
+1
diff --git a/‎paths/github-cli/01-github-CLI-introduction.md
+1 b/‎paths/github-cli/01-github-CLI-introduction.md
+1
diff --git a/‎paths/github-cli/02-local-configurations.md
+1 b/‎paths/github-cli/02-local-configurations.md
+1
diff --git a/‎paths/github-cli/03-create-repo-in-browser.md
+1 b/‎paths/github-cli/03-create-repo-in-browser.md
+1
diff --git a/‎paths/github-cli/04-choose-a-theme.md
+1 b/‎paths/github-cli/04-choose-a-theme.md
+1
diff --git a/‎paths/github-cli/05-cloning.md
+1 b/‎paths/github-cli/05-cloning.md
+1
diff --git a/‎paths/github-cli/06-create-branch.md
+1 b/‎paths/github-cli/06-create-branch.md
+1
diff --git a/‎paths/github-cli/07-local-files.md
+1 b/‎paths/github-cli/07-local-files.md
+1
diff --git a/‎paths/github-cli/08-2-step-commit.md
+2-1 b/‎paths/github-cli/08-2-step-commit.md
+2-1
diff --git a/‎paths/github-cli/09-push-and-pull.md
+1 b/‎paths/github-cli/09-push-and-pull.md
+1
diff --git a/‎paths/github-cli/10-merging.md
+1 b/‎paths/github-cli/10-merging.md
+1
diff --git a/‎paths/github-cli/11-view-your-site.md
+1 b/‎paths/github-cli/11-view-your-site.md
+1
diff --git a/‎paths/github-cli/12-sync-local-repo.md
+1 b/‎paths/github-cli/12-sync-local-repo.md
+1
diff --git a/‎paths/github-cli/13-join-class-repo.md
+1 b/‎paths/github-cli/13-join-class-repo.md
+1
diff --git a/‎paths/github-cli/14-review-local-workflow.md
+1 b/‎paths/github-cli/14-review-local-workflow.md
+1
diff --git a/‎paths/github-cli/15-push-and-open-pr.md
+1 b/‎paths/github-cli/15-push-and-open-pr.md
+1
diff --git a/‎paths/github-cli/16-collaborate.md
+1 b/‎paths/github-cli/16-collaborate.md
+1
diff --git a/‎paths/github-cli/17-merge-changes.md
+1 b/‎paths/github-cli/17-merge-changes.md
+1
diff --git a/‎paths/github-cli/viewing-history.md
+1 b/‎paths/github-cli/viewing-history.md
+1
diff --git a/‎paths/github-desktop/01-class-introduction.md
+1 b/‎paths/github-desktop/01-class-introduction.md
+1
diff --git a/‎paths/github-desktop/02-install-desktop.md
+1 b/‎paths/github-desktop/02-install-desktop.md
+1
diff --git a/‎paths/github-desktop/03-creating-repository-in-browser.md
+1 b/‎paths/github-desktop/03-creating-repository-in-browser.md
+1
diff --git a/‎paths/github-desktop/04-choose-a-theme.md
+1 b/‎paths/github-desktop/04-choose-a-theme.md
+1
diff --git a/‎paths/github-desktop/05-cloning-repository-locally.md
+1 b/‎paths/github-desktop/05-cloning-repository-locally.md
+1
diff --git a/‎paths/github-desktop/06-create-a-branch.md
+1 b/‎paths/github-desktop/06-create-a-branch.md
+1
diff --git a/‎paths/github-desktop/07-make-local-changes.md
+1 b/‎paths/github-desktop/07-make-local-changes.md
+1
diff --git a/‎paths/github-desktop/08-add-commits-desktop.md
+1 b/‎paths/github-desktop/08-add-commits-desktop.md
+1
diff --git a/‎paths/github-desktop/09-open-pull-request.md
+1 b/‎paths/github-desktop/09-open-pull-request.md
+1
diff --git a/‎paths/github-desktop/10-merging-pull-requests.md
+1 b/‎paths/github-desktop/10-merging-pull-requests.md
+1
diff --git a/‎paths/github-desktop/11-view-your-site.md
+1 b/‎paths/github-desktop/11-view-your-site.md
+1
diff --git a/‎paths/github-desktop/12-sync-local-repo.md
+1 b/‎paths/github-desktop/12-sync-local-repo.md
+1
@@ -34,6 +34,7 @@ en: &DEFAULT_EN
   show-me-how           : "Show me how"
   troubleshooting       : "Help me troubleshoot"
   tell-me-why           : "Tell me why"
+  get-help              : "Get Help"
   stuck                 : "Stuck? Open an issue in the repository for this class and mention <strong>@githubteacher</strong> for help from one of the GitHub trainers!"
   continue              : "Continue"
 en-US:
@@ -75,6 +76,7 @@ es: &DEFAULT_ES
   show-me-how           : "Enséñame cómo"
   troubleshooting       : "Ayúdame a resolver"
   tell-me-why           : "Dime por qué"
+  get-help              : "Pide Ayuda"
   stuck                 : "¿Atascado? Abre un tema (issue) en el repositorio para esta clase y menciona a <strong>@githubteacher</strong> para obtener ayuda de uno de los instructores de GitHub."
   continue              : "Continuar"
 es-ES:
 
@@ -120,9 +120,12 @@
             </details>
           {% endif %}
 
+          {% if page.help %}
           <div class="flash mb-2 flash-success">
-            {{ site.data.ui-text[page.lang].stuck }}
+            <div class="float-left p-1 mr-3"><a href="{{ page.help }}" class="btn btn-primary">{{ site.data.ui-text[page.lang].get-help }}</a></div>
+            <div class="overflow-hidden">{{ site.data.ui-text[page.lang].stuck }}</div>
           </div>
+          {% endif %}
 
           {% if page.next-page %}
             <a href="{{ site.baseurl }}{{ page.next-page }}" class="btn">{{ site.data.ui-text[page.lang].continue }}</a>
 
@@ -22,12 +22,7 @@
     description: Learn how to **use the Command Line** to copy a repository to your computer, track changes and communicate with GitHub.
     image: images/about/collabocats.jpg
     imageAlt: The 'collabocats', cartoon of octocats pictured on two laptops with symbols showing they're collaborating on code
-    link: /github-cli
-  - title: Managing Merge Conflicts
-    description: First you had issues, now you have conflicts. Learn how to resolve at least one of them.
-    image: ./images/skatetocat.png
-    imageAlt: The 'skatetocat', a cartoon of an octocat using a skateboard and having fun
-    link: /merge-conflicts    
+    link: /github-cli    
   - title: GitHub for Windows Users
     description: Learn how to configure your local git environment to work with GitHub and how to complete GitHub flow using the GitHub Extension for Visual Studio.
     image: images/red-polo.png