@jedixman: every series has two orders the air date order and production order, episodes are not always aired in the order they were made, this isn't as common now but it used to be, this can cause some confusion as often times dvd releases will use the production order to be more historically accurate so the air date order should be used but if possible a note should probably be added in the series description or individual episode descriptions about the different orders.
If you are not sure if a site is using the air date order and two sites are conflicting go to a third site and whichever is most used go with that one :)
It's weird. I thought there was a conflict... but I might have just been tired (like I am right now...).
If there are further conflicts, I'll follow your advice. Thanks.