Fixing a bug when deleting conflict resolutions

Created by  pmeunier  on May 11, 2021
352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4AC
Change contents