Made the conflict detection slightly less brittle by not requiring a specific order of events.

I also removed the "both events are recurring but don't have exceptions
check, which isn't correct.