Solving a conflict (due to the new conflict detection algorithm)

Created by  pmeunier  on December 27, 2023
J2OHO7RASKJ2FN7PMKOGPXPPOVP4BPGBEUS2YD5FJY35A4PBNQBAC
Change contents