Quelques modifications
fix merged conflict