Practice merge conflict resolution

[the1Riddle]

What type of challenge do you want?

code

(Optional) Scenario file name

txt_scenario.md

[github-actions]

🎉 Conflict scenario ready for @the1Riddle

🔹 Branch main: version 2
🔹 Branch conflict-5be64587: version 3

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

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

[the1Riddle]

all scenarios works well