diff --git a/.travis.yml b/.travis.yml
index c081c8ce..89e77d86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,6 @@ jobs:
   include:
     - stage: test
       name: coverage
-<<<<<<< HEAD
-      script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage    
-=======
       script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage
     - stage: test
       name: coverage64
@@ -40,7 +37,6 @@ jobs:
     - stage: test
       name: tex
       script: cp -r $PWD ../build_tex && cd ../build_tex && ./ci/travis_run.py ./ci/regression.sh -tex
->>>>>>> xlen-parameterization
     - stage: test
       name: cluster
       script: cp -r $PWD ../build_cluster && cd ../build_cluster && ./ci/travis_run.py ./ci/regression.sh -cluster