diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
index 130aae77e09a9cddd153ba776b87304b9d1ea9c0..b752abd0d16d759d796dada00610ec039588f71a 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
@@ -24,11 +24,7 @@ package org.caosdb.server.database.backend.implementation.MySQL;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLIntegrityConstraintViolationException;
-<<<<<<< HEAD
 import org.caosdb.server.database.DatabaseUtils;
-=======
-import java.sql.Types;
->>>>>>> f-filesystem-cleanup
 import org.caosdb.server.database.access.Access;
 import org.caosdb.server.database.backend.interfaces.InsertSparseEntityImpl;
 import org.caosdb.server.database.exceptions.IntegrityException;
@@ -41,12 +37,7 @@ public class MySQLInsertSparseEntity extends MySQLTransaction implements InsertS
     super(access);
   }
 
-<<<<<<< HEAD
-  public static final String STMT_INSERT_SPARSE_ENTITY = "call insertEntity(?,?,?,?)";
-=======
   public static final String STMT_INSERT_SPARSE_ENTITY = "call insertEntity(?,?,?,?,?)";
-  public static final String STMT_INSERT_FILE_PROPERTIES = "call setFileProperties(?,?,?,?)";
->>>>>>> f-filesystem-cleanup
 
   @Override
   public void execute(final SparseEntity entity) {
@@ -67,20 +58,6 @@ public class MySQLInsertSparseEntity extends MySQLTransaction implements InsertS
         }
       }
 
-<<<<<<< HEAD
-=======
-      if (entity.filePath != null) {
-        insertFilePropsStmt.setString(1, entity.id);
-        insertFilePropsStmt.setString(2, entity.filePath);
-        insertFilePropsStmt.setLong(3, entity.fileSize);
-        if (entity.fileHash != null) {
-          insertFilePropsStmt.setString(4, entity.fileHash.toString());
-        } else {
-          insertFilePropsStmt.setNull(4, Types.VARCHAR);
-        }
-        insertFilePropsStmt.execute();
-      }
->>>>>>> f-filesystem-cleanup
     } catch (final SQLIntegrityConstraintViolationException exc) {
       throw new IntegrityException(exc);
     } catch (final TransactionException exc) {
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
index bdfa6a5cf4cd29aa9d5fb0d24a0e73a0e29642b2..adcb4baa3abca830a1bef5493129c330219306a5 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
@@ -147,7 +147,6 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
           } else {
             entity.setFlag(RegisterFileDownload.FLAG, RegisterFileDownload.FALSE);
           }
-          }
           container.add(entity);
         }
       }
diff --git a/src/main/java/org/caosdb/server/transaction/Transaction.java b/src/main/java/org/caosdb/server/transaction/Transaction.java
index 1b7e3b7976f148180e70443a019cdf71e36fbd29..bd73da6bcbd4a20abdb19b28b575f12abce11e6c 100644
--- a/src/main/java/org/caosdb/server/transaction/Transaction.java
+++ b/src/main/java/org/caosdb/server/transaction/Transaction.java
@@ -51,10 +51,10 @@ import org.caosdb.server.permissions.EntityACL;
 import org.caosdb.server.utils.AbstractObservable;
 import org.caosdb.server.utils.Info;
 import org.caosdb.server.utils.Observer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.caosdb.server.utils.UseCacheResource;
 import org.caosdb.server.utils.UseCacheResourceDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The NoOpCache is used when the caching is diabled (globally or for the current transaction.