) have changed from the base [...] all colliding changes [...] . All changes with a conflict
) is the management of changes to documents, programs [...] Tracking of changes