Conflict with your terminal simulator

Screen Link:
https://app.dataquest.io/m/121/merge-conflicts/5/resolving-multiple-conflicts

My Code:

/home/dq$ git clone /dataquest/user/git/chatbot
Cloning into 'chatbot'...
done.
/home/dq$ cd chatbot
/home/dq/chatbot$ git checkout -b feature/king-bot
Switched to a new branch 'feature/king-bot'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "added a kingly statement"
[feature/king-bot 0a38455] added a kingly statement
 1 file changed, 2 insertions(+), 1 deletion(-)
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git checkout -b feature/queen-bot
Switched to a new branch 'feature/queen-bot'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "added the queenly statement"
[feature/queen-bot 91aa70b] added the queenly statement
 1 file changed, 2 insertions(+), 1 deletion(-)
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git merge feature/king-bot
Updating 34163fb..0a38455
Fast-forward
 bot.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
/home/dq/chatbot$ git merge feature/queen-bot
Auto-merging bot.py
CONFLICT (content): Merge conflict in bot.py
Automatic merge failed; fix conflicts and then commit the result.
/home/dq/chatbot$ git merge --abort
/home/dq/chatbot$ git branch
  feature/king-bot
  feature/queen-bot
* master
/home/dq/chatbot$ git merge feature/queen-bot
Auto-merging bot.py
CONFLICT (content): Merge conflict in bot.py
Automatic merge failed; fix conflicts and then commit the result.
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "Fixed conflicts"
[master e9241d2] Fixed conflicts
/home/dq/chatbot$ git push origin master
Counting objects: 9, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 848 bytes | 0 bytes/s, done.
Total 7 (delta 0), reused 0 (delta 0)
To /dataquest/user/git/chatbot
   34163fb..e9241d2  master -> master
/home/dq/chatbot$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git checkout -b feature/random-printing
Switched to a new branch 'feature/random-printing'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
some random message
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "added random messages"
[feature/random-printing ec0ef74] added random messages
 1 file changed, 6 insertions(+)
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git checkout -b feature/dice-roller
Switched to a new branch 'feature/dice-roller'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
6 5
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "dice function"
[feature/dice-roller 4de77eb] dice function
 1 file changed, 4 insertions(+)
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git branch
  feature/dice-roller
  feature/king-bot
  feature/queen-bot
  feature/random-printing
* master
/home/dq/chatbot$ git merge feature/random-printing
Updating e9241d2..ec0ef74
Fast-forward
 bot.py | 6 ++++++
 1 file changed, 6 insertions(+)
/home/dq/chatbot$ git merge feature/dice-roller
Auto-merging bot.py
CONFLICT (content): Merge conflict in bot.py
Automatic merge failed; fix conflicts and then commit the result.
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
some random message
4 4
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "Resolved multi-line conflict"
[master 40c6504] Resolved multi-line conflict
/home/dq/chatbot$ git push origin master
Counting objects: 11, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 915 bytes | 0 bytes/s, done.
Total 9 (delta 3), reused 0 (delta 0)
To /dataquest/user/git/chatbot
   e9241d2..40c6504  master -> master
/home/dq/chatbot$ git branch
  feature/dice-roller
  feature/king-bot
  feature/queen-bot
  feature/random-printing
* master
/home/dq/chatbot$ git checkout -b feature/more-printing
Switched to a new branch 'feature/more-printing'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "added some more printing"
[feature/more-printing 26f0292] added some more printing
 1 file changed, 2 insertions(+)
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git checkout -b feature/more-printing-2
Switched to a new branch 'feature/more-printing-2'
/home/dq/chatbot$ nano bot.py
/home/dq/chatbot$ python bot.py
Hello, let's chat!
Off with her head!
some random message
5 2
a different print statement
/home/dq/chatbot$ git add bot.py
/home/dq/chatbot$ git commit -m "added some more printing again"
[feature/more-printing-2 2dfa0bd] added some more printing again
 1 file changed, 2 insertions(+)
/home/dq/chatbot$ git checkout masterclear
error: pathspec 'masterclear' did not match any file(s) known to git.
/home/dq/chatbot$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
/home/dq/chatbot$ git merge 

What I expected to happen:

I keep on writing my merge statement and eventually hit enter and everything is great

What actually happened:

The terminal just became unresponsive

Some visualizations with nano are off too and I think you guys did a great job with the interface but this will be the second time I have to repeat this lesson because I get this problem on screen 5.

Please use the ? button in the top-right corner of the Classroom page to report issues with the platform to Dataquest directly.