Ajout de newFile
Deleted newFile
ajout texte newBranch
deleted text
Fixed conflict