Check if adapter fired ready event before listener was registered.

Otherwise, TandemFile will not know that the adapter is ready, and the initial
ot/sync packet is never sent.
Resolve merge confs.