diff --git a/.travis.yml b/.travis.yml
index e6a933c5..a1524638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-<<<<<<< HEAD
   - 2.4.0
   - 2.6.0
   - jruby-9.2.7.0