In this episode we got to see two sides of Johnny. One where he is selfcentered and just wants Marissa to stay with him and one where he realizes he has to make the right decision and that is to let her go.
When Marissa finds out that Johhny won't be able to go to the surf tour, just by the look in her eyes I could see what she was thinking. Staying with him and not returnig to Harbor.
And there goes her knight in shinig armour aka Ryan to save the day. He convinces Johnny to do what's best for her.
Ryan, Seth and Summer wait until the sun sets and for a second one starts to lose hope in Marissa's return. But at the last minute she shows up.