UpdateFileFilter conflict resolution
UpdateFileFilter now works nicely with multiple updates with the same or
different modification dates.