# Conflicts:
#	harvester/src/main/java/com/indexdata/masterkey/localindices/harvest/storage/folioinventory/InventoryRecordUpdater.java
#	harvester/src/main/java/com/indexdata/masterkey/localindices/util/MarcXMLToJson.java