The second alternative is correct.
The conflict consists of any and all kinds of opposition between the characters in a play. Conflicts can be of various natures, as in ideas, opinions, choices, attitudes. Conflicts are part of the plot and enrich the narratives. In some situations the more complex characters also have internal conflicts.