<PLEASE USE THE FOLLOWING TEMPLATE TO HELP YOU CREATE A GREAT POST!>
<Below this line, add a link to the EXACT exercise that you are asking about.>
Learn Git, Branching, Merge II (8/10)
<Below this line, describe in what way does your code behave incorrectly? Include ALL error messages.>
On step 5, where I am supposed to commit, I get the following error:
fatal: cannot do a partial commit during a merge.
<Below this line, add a screenshot of your whole web browser so that we can see what you see.>