Fixing the numbering of conflicts

Created by  pmeunier  on December 15, 2023
HWIOJHTRHIPEQ6KTFH53YLZDUSEYBZQBUPTWABMOG4L4HBS6DPZAC
Change contents