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

Fixing the numbering of conflicts

Created by  pmeunier  on December 15, 2023
HWIOJHTRHIPEQ6KTFH53YLZDUSEYBZQBUPTWABMOG4L4HBS6DPZAC
Change contents