Redecoupage du code
Fix conflict
Fix conflict