When saving with FAIL_IF_NOT_CONFLICTING merge mode, the merge is done on...

... the client instead of doing a refetch / Added a button in AccountEditor