reconcile

Reconcile increment ID collisions after multi-developer merge. Renumbers conflicting increments based on modification dates.