Love Island: Jack and Dani make-up as friends following a rocky patch