Get the conflict detection algorithm test to pass

Not sure how this ever passed.

It seems to me the conflict detection algorithm is only built to detect
a conflict between a recurring event and another event, and not between
two recurrences if the initial events do not conflict, however, this is
what the test attempts to test.

I'm not certain the change in the algorithm actually works if the events
were the other way around.