[New: openFATE 326928] Improve conflict resolution