Zotero 7 Beta: Conflict Resolution window

mjthoraval

The Conflict Resolution window has a few bugs:
- Windows 10: Zotero-ConflictResolution-Windows10
- Ubuntu 23.10: Zotero-ConflictResolution-Ubuntu23.10

dstillman

Should be fixed now in beta 80