Fixing conflicts

Created by  pmeunier  on January 4, 2021
KMFL6X7EVH2XHWYYND6J3D73ULNM4HL3HX7SQQJ6GRVW3VZRZEQQC
Change contents