Is it over between Olivia and Hunter?

Olivia is torn about her future with Hunter when he turns nasty

John gives Hunter a tough time during his bronze medallion lifeguard test and ends up failing him. When Olivia tracks Hunter down to give him some support, he snaps and leaves her close to tears. Olivia tells Irene about the incident and Irene advises Olivia to call time on their relationship. Will she take Irene’s advice?

Also, will Leah find out the truth about what happened between Zac and Sam? And will there be professional consequences for Zac for getting too close to his literary agent?