diff --git a/.travis.yml b/.travis.yml
index 876c22e..4c397d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,18 @@
 version: ~> 1.0
 
 import:
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
+=======
+>>>>>>> 3.4
   - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml
 
 env:
   global:
     - REQUIRE_EXTRA:"ezyang/htmlpurifier:*"
+<<<<<<< HEAD
+=======
+>>>>>>> 3.3
+>>>>>>> 3.4