don't merge: testing p2p sync