Resolved conflicts

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

@@ -2,19 +2,15 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.BaseEntity;
 
 import java.math.BigDecimal;
 
 @Entity
-@Table(name = "\"REGION\"")
+@Table(name = "REGION")
 @Getter
 @Setter
 public class RegionEntity extends BaseEntity {

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "\"ROLE\"")
+@Table(name = "ROLE")
 @Getter
 @Setter
 public class RoleEntity extends BaseEntity {

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

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.BaseEntity;
 
 import java.time.LocalDateTime;