Matches https://github.com/ilyagr/pijul-clone as of now, might become out of sync

Fixing conflict identifiers (some nested conflicts were wrong)

Created by  pmeunier  on January 4, 2022
7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC
Change contents