merged with EHRI/master

when trying to rebase, we got an error message we didn't understand:

git rebase EHRI/master
First, rewinding head to replay your work on top of it...
Applying: created importer for ifz, empty controlaccess tags are ignored by EadImporter, no UndeterminedRelation is created
Applying: Remove double mention of langOfMaterial in jmp import
Applying: Modify cegesoma properties
Applying: Force the use of the identifier as the title if no NAME is provided
Applying: Use the ehri_main_identifier for cegesoma foto files
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	ehri-importers/src/main/resources/cegesomaCA.properties
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0005 Use the ehri_main_identifier for cegesoma foto files
The copy of the patch that failed is found in:
   /Users/linda/git/ehri-rest/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".