fix: conflict solve

backend/src/main/java/com/edufocus/edufocus/user/model/service/UserServiceImpl.java

@@ -142,13 +142,6 @@ public class UserServiceImpl implements UserService {
         userRepository.deleteRefreshToken(id);
     }
 
-    @Override
-    public boolean isEmailExist(String email) {
-        Optional<User> user = userRepository.findByEmail(email);
-
-        return user.isPresent();
-    }
-
     @Override
     public void changeForgottenPassword(Long id, String newPassword) {
         User user = userRepository.findById(id).orElse(null);