merge conflict

src/main/java/fr/eni/enchere/controllers/ArticleController.java

@@ -68,6 +68,12 @@ public class ArticleController {
             Optional<Float> maxMontantEnchere = lastEnchere.stream()
                     .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère
                     .max(Float::compareTo);
+            UserProfil currentUser = userService.utilisateurByName(authentication.getName());
+            boolean isArticleCurrentUser = false;
+            if (currentUser.getId() == user.getId()) {
+                isArticleCurrentUser = true;
+            }
+            model.addAttribute("isArticleCurrentUser", isArticleCurrentUser);
             model.addAttribute("article", article);
             model.addAttribute("username", user);
             model.addAttribute("cate", cate.getLibelle());