I noticed that we have tags for: armed-conflict, conflict, and war.
There was an earlier request to make armed-conflict a synonym of war which never went anywhere due to concerns that there were non-war armed conflicts:
The Troubles in Northern Ireland could be classifies as an "armed conflict", but not really as a "war". A number of questions seem to be about non-war armed conflicts like that – user11249
While this makes sense, people don't seem to be using armed-conflict in that way, and questions seem to be a mix of war, terrorism, and military.
I think armed-conflict should be made a synonym of war and questions about non-war armed conflicts should be retagged to terrorism, civil-war, or territorial-dispute as needed.
We might want to also make a new tag for non-war armed-conflicts, perhaps something like irregular-war or violent-unrest to describe things like The Troubles.
conflict should be eliminated, since it's much too vague to be useful.
To JamesK's point, I don't like tags that are supersets of another tag. By this definition, every question tagged with "war" should also be tagged with "armed-conflict" and finding questions about "non-war armed conflicts" would involve doing a search for armed-conflict but NOT war, which I'm not sure you can even do here.