BUG: fix merge errors

src/main/java/org/caosdb/server/filesystem/FSODescriptor.java

@@ -189,6 +189,7 @@ public class FSODescriptor implements VirtualFSODescriptorInterface {
 
   public static FSODescriptor createDir(String fileStorageId, final Path dirPath) {
     final FSODescriptor ret = new FSODescriptor(dirPath);
+    ret.key = dirPath.toString();
     ret.fileStorageId = fileStorageId;
     ret.type = ObjectType.DIRECTORY;
     return ret;

src/main/java/org/caosdb/server/jobs/core/AutoCreateDirs.java

@@ -14,6 +14,7 @@ import org.caosdb.server.jobs.EntityFlagJob;
 import org.caosdb.server.jobs.JobAnnotation;
 import org.caosdb.server.jobs.TransactionStage;
 import org.caosdb.server.permissions.EntityACL;
+import org.caosdb.server.transaction.WriteTransactionInterface;
 
 @JobAnnotation(
     flag = "autoCreateDirs",
@@ -78,6 +79,7 @@ public class AutoCreateDirs extends EntityFlagJob {
     child.setParentDirectory(newFD.getEntityId());
 
     final EntityInterface newDir = new InsertEntity(name, Role.Directory);
+    newDir.setId(((WriteTransactionInterface) getTransaction()).generateId());
     newDir.setEntityACL(EntityACL.getOwnerACLFor(getUser()));
     newDir.setFSODescriptor(newFD);
     getContainer().add(newDir);