The ending may have been a little bit rushed, especially the part where we see Marina overcoming her prejudice against Shizuka

Never underestimate the power of common ground, no matter how silly it could be