Disney and Sony have reconciled for one more Spider-Man movie starring Tom Holland – after a very public falling-out that suggested the superhero would no longer appear in Marvel movies.