Practice merge conflict resolution

[xbuyan]

What type of challenge do you want?

text

(Optional) Scenario file name

No response

[github-actions]

🎉 Conflict scenario ready for @xbuyan

🔹 Branch main: version 2
🔹 Branch conflict-cb6ad81c: version 3

File to resolve:
Solutions/Conflict-fixes/xbuyan-txt_scenario.md

Fork the repo, resolve the conflict, then open a PR to complete the task! 💪