Fixes for conflict detection (and unresolved bugs highlighted in comments) / using conflict-detection mode in AccountEditor