on Jane Friedman site:
Have you ever been a bit hazy on the difference between conflict and tension? If so, you aren’t alone. It’s common to confuse the two because they’re often used together to deliver a one-two dramatic punch.
The difference between them is subtle, but important: