All live or draft changes can now be accepted with one click from the new "Resolve all" dropdown in the merge conflicts view.