Conflict resolved

src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java

@@ -8,4 +8,5 @@ import java.util.Optional;
 public interface UserRepository extends JpaRepository<UserEntity, Long> {
     Optional<UserEntity> findByEmailIgnoreCase(String email);
     boolean existsByEmailIgnoreCase(String email);
+    UserEntity findByEmail(String email);
 }