private void mergeConflicts(int programMergeFilterCommentType, ListingMergePanel listingPanel,
			Address addr, int chosenConflictOption, TaskMonitor monitor) throws CancelledException {
		if (!hasConflict(addr, programMergeFilterCommentType)) {
			return;
		}
		monitor.setMessage(
			"Resolving " + getTypeName(programMergeFilterCommentType) + " Comment conflicts.");
		int choiceForCommentType = getChoiceForCommentType(programMergeFilterCommentType);
		if (choiceForCommentType != ASK_USER) {
			merge(addr, programMergeFilterCommentType, choiceForCommentType, monitor);
			return;
		}
		if (chosenConflictOption == ASK_USER && mergeManager != null) {
			showMergePanel(listingPanel, addr, programMergeFilterCommentType, monitor);
			monitor.checkCancelled();
		}
		else {
			merge(addr, programMergeFilterCommentType, chosenConflictOption, monitor);
		}
	}
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