userprefs commit
"committed after conflict"