diff --git a/.travis.yml b/.travis.yml
index 3317024ded..a077ade0b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,6 @@ before_script:
   - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
 
 script:
-<<<<<<< HEAD
   - cd build
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi"
   - cd ..