No, because conflict seem connoting a war that stays for a limited period of time, but a dispute could stay for longer. However, battle is an appropriate word for this. But in some cases, conflict is used such as in strategic studies where term cold war follows it.
