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