diff --git a/.travis.yml b/.travis.yml
index 0e756e6..ac10de9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,8 @@ language: python
 env:
   - TOX_ENV=py26
   - TOX_ENV=py27
-<<<<<<< HEAD
   - TOX_ENV=py33
   - TOX_ENV=py34
-  - TOX_ENV=docs
-=======
->>>>>>> b004fbf
   - TOX_ENV=flake8
 install:
   - pip install tox