Tentative de merge User.java