I think that conflict is inevitable in any social structure. The way I personally deal with conflicts is trying out "Shou ga nai （仕様が無い）<----hopefully the right kanji 0_0....Kanji is really difficult for myself as well as speaking. This is what I will work on the most while studying abroad in Japan. Going back to the Shou ga nai concept, basically, you try to remain neutral and see from both perspectives. Also, it's the concept of "it can't be helped." Since I have incorporated that mindset/focus into my life, I have dealt with conflict much better.