Update the conflictedFields and dirtyFields arrays on conflict resolution