resolve merge conflicts: lbrynet/core/client/BlobRequester.py lbrynet/core/Peer.py lbrynet/lbryfilemanager/EncryptedFileManager.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/Publisher.py
This is the result of running: grep -RlI LBRY . | xargs sed -i 's/LBRY\([A-Z]\)/\1/g'