fix merge conflicts

.travis.yml

@@ -5,16 +5,17 @@ python:
 
 install:
   - pip install --upgrade pip
-  - pip install -r requirements.txt
   - pip install "pytest>=3.6"
   - pip install codecov pytest-cov pytest-asyncio pylint
+  - python setup.py develop
 
 script:
-  - pytest --cov=./ -v
-  - pylint --rcfile=.pylintrc encryption host libp2p network peer protocol_muxer stream_muxer transport tests
+  - pytest --cov=./libp2p tests/
+  - pylint --rcfile=.pylintrc libp2p/!(kademlia) tests
 
 after_success:
   - codecov
 
 notifications:
     slack: py-libp2p:RK0WVoQZhQXLgIKfHNPL1TR2
+