diff --git a/.travis.yml b/.travis.yml
index 543ac8233..c825bdc67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,11 +67,8 @@ matrix:
       env: KARMA=true REACT=15
     - node_js: "6"
       env: KARMA=true REACT=16
-<<<<<<< HEAD
     - node_js: "lts/*"
       env: REACT=16.8.5 RENDERER=16.8.3
-=======
->>>>>>> be17876bfab1b4e659265ac5fafb893cab63bfd3
   exclude:
     - node_js: "6"
       env: REACT=0.13