They had been locked in a legal battle since Lively sued Baldoni in December after they worked together on It Ends With Us film.