resolution des conflits du merge entre move et photo
resolution conflits player
resolution conflits player