diff --git a/.travis.yml b/.travis.yml
index c7a67ed9be..bb33ba5b08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,4 @@ before_script:
   - git config --global user.name "CamperBot"
 
 script:
-<<<<<<< HEAD
-  - npm run test-ci
-=======
-  - npm run test
-  - cd ./client
-  - npm run build
->>>>>>> fix(ci-build): Make it so, Travis
+  - npm run test
\ No newline at end of file