I don't think it's important to determine who conflicts MORE, but rather how these types approach conflict.
I've heard INFJ's on this forum say they don't like conflict, and are averse to it. But over time they have recognized that some conflict now, actually increases harmony in the long run. In my mind, this a very pragmatic Je stance on the issue of conflict. They recognize that conflict is unpleasant, but the right kind of conflict can get desirable results. Still, I imagine they approach the conflict in a very Fe fashion, to make things go as smoothly as possible.
(the INFP stuff beneath is all my own experience, so I'm not sure if this is just me)
Meanwhile, an INFP will almost always avoid conflict, unless it interferes with a core value. This is because we don't like to impose our vision on the environment. We want people to change their ways due to a shift in internal state, and we promote our values via modelling them, and living them out as best as we can.
If someone does something kinda inconsiderate, I'll let it go, since people have a right to express themselves as individuals. Who knows what kind of shit they have going on in their life, maybe I'd act that way too if I were in their position. That value, to me at least, trumps the need to always be polite and perfect.
However, if this person is consistently a dick, eventually I'll reach a point where I'll hulk out on inferior Te and be like: "THAT'S ENOUGH! No one has the right to behave like that all the time. You are making me feel (blank), please stop this behaviour." The problem is, a lot of my inferior function is speaking now, and I have a shitty handle of Te, and it makes my words come out a bit harsh and undiplomatic. And that person will usually give me this routine:


Wow! Where did THAT come from? Don't expect me to be mind reader, Jeremy. Jeez, to think I thought you were nice, blah, blah, blah.
Then the other person seems to think I should apologize to THEM. And while I do feel bad, I can't believe that they seem to think they were hit out of nowhere. I usually monitor other people's internal state pretty closely, so I'm surprised when I realize how little they pay attention to mine. What they don't understand is that by allowing something to happen once, I was not telling them that I think what they did is ALWAYS okay. That is a generalized Je way to look at things. I don't have a general set of interpersonal laws I always follow. I believe in giving people enough wiggle room for individual circumstances. Really, I let things go in good faith, assuming they'll correct it.
That being said, if I was smart and approached the situation in a Je way, I would communicate these feelings to people immediately, rather than 100 incidents later. However it's very uncomfortable and difficult for me to verbally articulate exactly what's happening internally in the moment. It's something I need to work on, to be sure.
I'm starting to lose myself in my brain, not sure if that makes sense. However, I hope this helped you decide whether you're INFP/INFJ.
For the record, you seem INFP to me, but it's difficult to tell based on what you said in the video.