@Override
				public void run() {
					setupConflictsPanel(listingPanel, CommentMerger.this.currentAddress,
						CommentMerger.this.programMergeType, changeListener);
					listingPanel.setBottomComponent(conflictPanel);
				}
Determines if there is a conflict for the indicated type of comment
at the specified address.
@param addr
@param programMergeCommentType
@return
Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CommentMerger.java