The movie portrays the rise of X and the conflict of Y.
A reader could interpret the sentence as the rise of two things, but I want them to unambigiously interpret the sentence as the portrayal of a rise and a conflict. Do I add a comma after X then to get:
The movie portrays the rise of X, and the conflict of Y.