resolving_merge_conflict
Merge branch '41-Ajouter-aux-favoris'