[EPIC] Review and test "Conflict Resolution" to cover all cases

Especially cases of "false-positives" when concurrent editing of schedules is happening.