Marnie and Nathan make an attempt to put their feud to rest, while Sam and Chloe work through their problems. Plus, things get heated between best friends Steph and Abbie