Revert "commit de resolutation de merge conflict"
Revert "commit de resolutation de merge conflict"

This reverts commit ba64dc3fa5f5b60f73dea25cb4d241ad048f1d9a.

TheMOOCAgency/edx-platform,TheMOOCAgency/edx-platform,TheMOOCAgency/edx-platform,TheMOOCAgency/edx-platform