void setConflictResolution(int option) {
		conflictOption = option;
	}
For Junit testing purposes only.
@param option option for resolving a conflict
Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java