fix merge conflicts

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

@@ -40,7 +40,6 @@ import org.caosdb.server.entity.WritableEntity;
 import org.caosdb.server.entity.wrapper.Property;
 import org.caosdb.server.jobs.JobAnnotation;
 import org.caosdb.server.jobs.JobExecutionTime;
-import org.caosdb.server.transaction.Delete;
 import org.caosdb.server.transaction.WriteTransaction;
 import org.caosdb.server.utils.EntityStatus;
 import org.caosdb.server.utils.Observable;
@@ -68,7 +67,7 @@ public class InitEntityStateJobs extends EntityStateJob implements Observer {
       State newState = handleNewState();
       State oldState = handleOldState(newState);
       if (newState != null || oldState != null) {
-        if (!(getTransaction() instanceof Delete)) {
+        if (!(getEntity() instanceof DeleteEntity)) {
 
           appendJob(MakeStateProperty.class);
         }