Implements an adjust function which detects conflicts

Also minor renaming
Adjust algorithm starts at greatest offset

Because we are constantly updating (adjusting) patches, need to start with the
greatest offsets to adjust so an adjustment doesn't create a conflict that
does not exist.
Implements replay algorithm that handles conflicts

Detects conflicts using the new adjust patch