Properly account for the case when the track table is empty, when doing our conflict resolution lookups.
Add better debugging.