The sound distributed version control system

fix remaining conflicts

Created by  fogti  on August 5, 2021
TFTQAJHCELIHDUOKHP6VN3I77GKFCXYA5IVSSCKZDOLKLILMR5UQC
Change contents