M&S ends tape-measure ban row, LA lifeguards battle El Niño surf, Chisholm eyes Team GB