# Conflicts:
#	.gitignore
#	src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java
#	src/main/java/org/genesys2/server/model/genesys/AccessionId.java
#	src/main/java/org/genesys2/server/persistence/domain/AccessionIdRepository.java
#	src/main/java/org/genesys2/server/service/GenesysService.java
#	src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
#	src/main/java/org/genesys2/server/service/worker/ElasticUpdaterAspect.java
#	src/main/java/org/genesys2/server/servlet/controller/admin/AdminController.java
#	src/main/resources/content/language.properties