diff --git a/.travis.yml b/.travis.yml
index bb23d909e3e..a227bd785f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ install:
   - sudo apt-get install -y paparazzi-dev paparazzi-jsbsim gcc-arm-embedded libipc-run-perl cmake
 script:
   - arm-none-eabi-gcc --version
+<<<<<<< HEAD
 <<<<<<< HEAD
   - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make test; fi
 
@@ -33,6 +34,9 @@ addons:
 =======
 #  - make test
 >>>>>>> [test] coverity: only build with gcc and disable normal make test
+=======
+  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make test; fi
+>>>>>>> [test] coverity: only run make test if not running coverity tests
 
 env:
   global: