Conflict solving code (FOLDER edges)

Created by  pmeunier  on December 5, 2020
7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC
Change contents