The word خلاف/خلافات (khilaaf/khilaafaat) refer to a dispute, disagreement, or a difference of opinions. It can also be used to mean a “conflict” of sorts, however it’s not as intense as the “صراع” meaning of the word, which usually alludes to a conflict in the context of war or violent struggle.
To note that there is a dispute, one could say “بصير فيه خلاف” (biSeer fi khilaaf). If you would like to state that there had been a dispute previously, then you would just simply use “صار”. For example, “صار فيه خلافات بينهم” (Saar fi khilaafaat bayn-hum) would mean that they used to have some disagreements.
A verb that’s commonly used to “end” disputes is أنهى/ينهي (anha/yinhi). When paired with خلاف/خلافات, you might find sentences such as: “لازم ينهو الخلاف” (laazim yinhoo il-khilaaf), in English, “they need to end the conflict.” In the past, you could say “أنهو الخلاف” (anhoo il-khilaaf) or “فضو الخلاف” (faDDoo il-khilaaf) for “they ended the dispute”. As a side note, the verb “فضى/يفضي” (faDDa/yifaDDi) means to empty something, and therefore to end a dispute could also literally be translated as to “empty” a dispute.