___ is a feature that enables you to ___ the ___ that have been pushed to the ___. You can choose two ___ in ___-based providers to ___ the ___.
A) Auto-Merge, track, changes, repository, options, Git, merge, branch
B) Conflict-Resolution, track, conflicts, workspace, options, repository, resolve, changeset
C) Online Conflict Resolution, manage, conflicts, branch, options, Git, resolve, changeset
D) Conflict-Tracking, manage, changes, workspace, options, repository, merge, branch