diff --git a/chrome/content/zotero/elements/attachmentBox.js b/chrome/content/zotero/elements/attachmentBox.js
index 7e517ec2cc..182add6fbb 100644
--- a/chrome/content/zotero/elements/attachmentBox.js
+++ b/chrome/content/zotero/elements/attachmentBox.js
@@ -317,6 +317,7 @@
 			let selectButton = this._id('select-button');
 
 			let fileExists = this._item.isFileAttachment() && await this._item.fileExists();
+			let isMerge = ["merge", "mergeedit", "filemerge"].includes(this.mode);
 			let isImportedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_IMPORTED_URL;
 			let isLinkedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_LINKED_URL;
 			
@@ -392,7 +393,7 @@
 				pagesRow.hidden = true;
 			}
 			
-			if (this.displayDateModified && fileExists && !this._item.isWebAttachment()) {
+			if (this.displayDateModified && (fileExists || isMerge) && !this._item.isWebAttachment()) {
 				// Conflict resolution uses a modal window, so promises won't work, but
 				// the sync process passes in the file mod time as dateModified
 				if (this.synchronous) {
diff --git a/chrome/content/zotero/elements/mergeGroup.js b/chrome/content/zotero/elements/mergeGroup.js
index f0e890b806..e1a351077d 100644
--- a/chrome/content/zotero/elements/mergeGroup.js
+++ b/chrome/content/zotero/elements/mergeGroup.js
@@ -142,7 +142,6 @@
 			this._mergePane.libraryID = this.libraryID;
 			this._leftPane.data = this._data.left;
 			this._rightPane.data = this._data.right;
-			this._mergePane.data = this._data.merge;
 			
 			if (this._data.selected == 'left') {
 				this.choosePane(this._leftPane);