Depends on the type of joke. For setup/punchline and wordplay-type jokes, I think “contrast” is more apt. The punchline is a resolution, sure, but not usually in the sense of a conflict—it’s dispelling confusion by connecting the parts that have been presented, or inviting the audience to connect them to have that “Oh, I get it!” moment. That seems basically like kishoutenketsu.
To me, humour based on conflict, even between expectation and reality, falls more into the category of irony, mocking, or slapstick, where someone (or something) is the “butt of the joke”.
Is there such a thing as a joke that doesn't have a "butt", though? It's obvious in mocking and slapstick but even in wordplay the joke is at the expense of the structure and rules of language and implicitly the people who try to police it.
