A conflict is a fight between armed troops. Most likely in a nation.
War is the hostility towards other parties issued officially by governments/states. Crosses international borders.
Conflicts are part of war, though not every war sees actual conflict, nor is every conflict connected to war.