changement de styl
merging conflicts