combat vs conflict

combat and conflict both are nouns.

Word	Noun	Adjective	Verb	Adverb
combat	Yes	No	Yes	No
conflict	Yes	No	Yes	No

As nouns, conflict is a hypernym of combat; that is, conflict is a word with a broader meaning than combat:

combat: an engagement fought between two military forces
conflict: a hostile meeting of opposing military forces in the course of a war

Other hypernyms of combat include battle, engagement, fight.

As nouns, conflict is a hypernym of combat; that is, conflict is a word with a broader meaning than combat:

Other hypernyms of combat include battle, struggle.

combat (noun)	conflict (noun)
an engagement fought between two military forces	an open clash between two opposing groups (or individuals)
the act of fighting; any contest or struggle	a hostile meeting of opposing military forces in the course of a war
	an incompatibility of dates or events
	a disagreement or argument about something important
	opposition between two simultaneous but incompatible feelings
	opposition in a work of drama or fiction between characters or forces (especially an opposition that motivates the development of the plot)
	a state of opposition between persons or ideas or interests

combat (verb)	conflict (verb)
battle or contend against in or as if in a battle	go against, as of rules and laws
	be in conflict