Github Merge Conflict

I'm not sure I can actually see the conflict as I'm not logged in. Do you think you could post a screenshot of the page?

Usually if someone commits something where there's a conflict I get to press a 'resolve conflict' button and worst case I see something like:

...
>>>>>
something here
=======
something else
<<<<<

And I have to delete the >>>>>>/========/<<<<<<<< and then figure out what should go in the middle based on the two conflicting items, then click the 'mark as resolved' button.

In your case if someone added something new you probably want both bits in there, you just need to make sure that the brackets match.

I imagine there are a whole bunch of tutorials on YouTube that'd explain it a lot better than I'm doing though