fix merge conflicts

src/main/java/org/caosdb/server/entity/UpdateEntity.java

@@ -22,13 +22,13 @@
  */
 package org.caosdb.server.entity;
 
-import org.caosdb.server.transaction.Update;
+import org.caosdb.server.transaction.WriteTransaction;
 import org.caosdb.server.utils.EntityStatus;
 import org.jdom2.Element;
 
 /**
  * UpdateEntity class represents entities which are to be updated. The previous version is appeded
- * during the {@link Update} transactions initialization.
+ * during the {@link WriteTransaction} transactions initialization.
  *
  * @author Timm Fitschen (t.fitschen@indiscale.com)
  */