A conflict is a fight between different people or groups.
The two nations had a conflict over which one could use the water in the river.