diff --git a/.travis.yml b/.travis.yml
index caea869ff..e83a632d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,6 @@ before_script:
   - cp .env.travis .env
   - mysql -e 'create database homestead_test;'
 
-<<<<<<< HEAD
 # phpunit testing is disabled as dist vendor is cleared by removing unneeded files
 #script:
-#  - vendor/bin/phpunit
-=======
-script:
-  - vendor/bin/phpunit
->>>>>>> fcb18e56f0ef2ee4622ec16073a1ed2c9f329ec4
+#  - vendor/bin/phpunit
\ No newline at end of file