How do I resolve github conflicts?

I’ve run into a bit of an issue with github and was wondering if anyone could help me?
I’ve been doing some rebalancing of some JSON files over the last few days, I’m trying to merge changes that have come into affect while I’ve been doing the editing to my fork and it’s telling me there is a conflict, I was hoping someone could give me some directions on how to resolve it.

Edit: sorted now, props to anothersimulacrum for helping me out.