diff --git a/.travis.yml b/.travis.yml
index c081c8ce..2c30c3a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,6 @@ install:
   - export PATH=$VERILATOR_ROOT/bin:$PATH
   # Install toolchain
   - ci/toolchain_install.sh -all
-  # build project
-  - make -s
 
 # stages ordering
 stages:
@@ -30,9 +28,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 +35,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    
diff --git a/ci/regression64.sh b/ci/regression64.sh
index 3d16fbd3..785c1c88 100755
--- a/ci/regression64.sh
+++ b/ci/regression64.sh
@@ -10,7 +10,7 @@ coverage()
 {
 echo "begin coverage tests..."
 
-make -C tests/riscv/isa run-simx-64imfd
+make -C tests/riscv/isa run-simx-64
 
 echo "coverage tests done!"
 }