Bug with conflicting field edits between 1Password desktop and browser plugin

I came to report this issue and understand 1P_Dave's advice, however there is a user interface/experience failure involved.

When setting up a new account, I have the desktop client open so that I can modify and add to the item created during the initial sign-up process, saving all the changes only when the account setup is complete.
The account setup process usually involves configuring 2FA/MFA/OTP during which the plugin may be extremely helpful by offering to save the key and fill the code, which is of course an offer I cannot refuse. This results in a desktop client with unsaved edits and a one-time password which will disappear the moment I click [Save], with the only alternative being to [Cancel] and loose all my edits.

Since winding back time to just before I agree to the plugin saving the OTP so that I can click [Save] on the desktop client is too advanced a feature even for 1Password and a robust sync and merge process with simple and easy conflict resolution for multiple clients is very hard, perhaps the best solution is for the plugin save process to optionally prompt the user to save any outstanding changes before saving until the user disables the prompt.

Another approach which addresses a broader case would be the ability to restore selected entries from a previous version of an item to the current version.