Do we have to follow the exact idea listed or can we just improvise based on the theme resolving conflict?

l think you should stick to the theme.

There can be some flexibility on what the conflict resolution deals with.   Imagine the conflicts that can be resolved within two thoughts going on in the same mind.