Hi, and happy to help!
I think you're going to have to restart level 2, as your branches and merging have a lot of discrepancies. See below, and sorry this is needed due to this course not being very forgiving, but do note it's not too bad to restart and re-do level 2 and on. Here's how you re-do things
Try to avoid the following
- Having a merge going the wrong way. You merged master into deadly_skills, which is causing some issues.
- Make sure at the top of your deadly_skills branch you have the merge from the end of level 2.
That's the one you want to tag; the commit resulting from the command line merge from deadly_skills to master.
Let us know if that works or if you have any questions!