Resolved conflicts.

src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java

@@ -35,9 +35,6 @@ public class UserWithCompanyEntity extends BaseEntity{
 	@Column(name = "EMAIL")
 	private String email;
 
-	@Column(name = "JSON")
-	private String json;
-
 	@Column(name = "IS_DELETED")
 	private Boolean isDeleted = false;