conflit file
modif init
merge master into r6
R6 init commit