Practice merge conflicts

[nvdaes]

What does this PR do?

Remove conflict marks in a file, and proposes two options to open settings.

Which issue does this close?

Closes #350

What type of change is this?

• Fix a bug or error in an existing file
• Add new content or a missing section
• Improve accessibility (headings, links, alt text)
• Improve clarity or rewrite confusing content
• Other (fix merge conflict)

Checklist

• I tested my changes with a screen reader or checked heading structure
• All links point to real files that exist in this repo
• All images have descriptive alt text
• No [TODO] markers remain in my changes
• My commit message describes what changed and why

How to review this PR

1. Read the changed file(s) in the Files Changed tab
2. Check that headings follow proper hierarchy (H1, H2, H3 - no skips)
3. Verify links work by clicking them
4. Read link text out of context - does it still make sense?

Anything else?

[github-actions]

PR Validation Report

✅ Validation Passed

✓ Required Checks

✅ Issue Reference

✅ PR Description

📚 Learning Resources

Based on your changes, these guides might help:

• GitHub Flavored Markdown Reference
• Accessibility Standards Guide
• Learning Paths & Challenges

---

Automated validation by Learning Room Bot. Last updated: 2026-03-08T11:05:16.189Z
Questions? Check the guides or mention @Facilitator in a comment.

[github-actions]

📋 Content Validation Report

♿ Accessibility

• Table Description (docs/CHALLENGES.md Line 86)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 87)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 88)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 89)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 90)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 91)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 92)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 93)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 94)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 95)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 113)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 114)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 115)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 116)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 117)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 118)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 119)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 120)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 121)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 122)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 123)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 124)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 125)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 126)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 127)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 128)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 129)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 313)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 314)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 315)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 316)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/CHALLENGES.md Line 317)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 16)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 17)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 18)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 19)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 20)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 21)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 22)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 23)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 24)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 25)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 26)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 27)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 31)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 32)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 33)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 34)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 38)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 39)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 40)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 41)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 42)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 52)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 53)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 54)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 55)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 56)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 57)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 58)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 59)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 60)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 61)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 62)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 66)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 67)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 68)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 69)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 70)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 74)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 75)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 76)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 77)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 78)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 96)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 97)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 98)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 99)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 100)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 101)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 102)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 103)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 104)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 105)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 115)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 116)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 117)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 118)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 119)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 120)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 124)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 125)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 126)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 127)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 128)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 129)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 130)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

• Table Description (docs/keyboard-shortcuts.md Line 131)
  Consider adding a brief description before tables explaining their content.
  Fix: Add one sentence before the table explaining what data it contains.

📚 Learning Resources

• GitHub Flavored Markdown
• Accessibility Standards
• Content Guidelines

---

Automated validation by Learning Room. Questions? Check the guides or mention @Facilitator.

[accesswatch]

Closing practice PR. Great work practicing merge conflicts!

[github-actions]

Hi @accesswatch! Merge conflicts can be tricky, but you've got this! 💪

Quick steps to fix your conflict:

1. Click the "Resolve conflicts" button on your PR
2. GitHub will show you both versions side-by-side
3. Delete the lines you don't want (including the <<<<<<<, =======, >>>>>>> markers)
4. Keep only the version you want
5. Click "Mark as resolved"
6. Commit the merge

Need detailed steps? See the Merge Conflicts Guide

Screen reader tip: If the web editor is hard to use, try pressing . on your PR page to open github.dev editor.

---

Learning Room Bot