The sound distributed version control system

Fix an old conflict

Created by  pmeunier  on August 8, 2022
3UZ65KYC2YLFXRQAL7ADPXZJHVSOSJUR44FXKQN2WKBIXAMALMGAC
Change contents