Lively and Baldoni butted heads while filming It Ends With Us (pictured) last year, and things turned litigious in December when the actress sued him for sexual harassment