Update the conflictedFields and dirtyFields arrays on conflict resolution
Update the conflictedFields and dirtyFields arrays on conflict resolution

jrwren/juju-gui,bac/juju-gui,jrwren/juju-gui,mitechie/juju-gui,jrwren/juju-gui,mitechie/juju-gui,mitechie/juju-gui,bac/juju-gui,bac/juju-gui,jrwren/juju-gui,bac/juju-gui,mitechie/juju-gui