War versus Conflict