Will Calvin & Zayn ever make up?