party form save / edit buttons disable as appropriate. Save will update the core Person object now. Misc cleanup.
conflict resolution
merging