Git Assessment - extra lines

I failed my second attempt on the Git assessment. My issue is in the Together branch, and I have a couple of questions:

  1. Moving up joseph-roulin.jpg: I moved it up (via copy+paste) in the html after merging both drawings and pictures into together, then clicked on ‘accept both merges’ in VS. After that, I staged and committed. – Is there a mistake in these steps?

  2. Interpreting the diff is proving a little tricky, but I think I have extra lines that shouldn’t be there? I’m not sure what the +"<<<<<<<<HEAD" and “+>>>>>>>pictures” is supposed to indicate exactly.

(My diff does say ‘No new line at end of file’ but I have figured out that issue in my settings)