I think there is a difference between combat and conflict. There are arts that engage with combat, then there are arts that deal with conflict. I think Aikido comes under the latter. Aikido seeks a peaceful resolution to conflict through harmonizing with an attacker's energy. Thus there is no contest in Aikido. The aim of AJJ is the same, to subdue conflict rather than allow it to escalate or engage in a 'fight'. That is not to say that the waza of Aikido/AJJ is not combative, but rather combat is not the aim.

Combat is conflict. Conflict can be combat. I certainly agree with the rest.