Fixing merge conflicts in peer.py