diff --git a/testcpp/test.sh b/testcpp/test.sh
index 27c6c53f3..6d06c867b 100644
--- a/testcpp/test.sh
+++ b/testcpp/test.sh
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 
 echo Build BLIS CPP Template tests
 make clean
@@ -45,37 +44,3 @@ echo Run tests
 ./test_trmm_blis.x
 ./test_trsm_blis.x
 ./test_trsv_blis.x
-=======
-CWD=$(pwd)
-echo $CWD
-make clean
-make blis CFLAGS+="-DFLOAT"
-numactl -C 1 ./test_gemm1_blis.x
-make clean
-make blis CFLAGS+="-DDOUBLE"
-numactl -C 1 ./test_gemm1_blis.x
-make clean
-make blis CFLAGS+="-DSCOMPLEX"
-numactl -C 1 ./test_gemm1_blis.x
-make clean
-make blis CFLAGS+="-DDCOMPLEX"
-numactl -C 1 ./test_gemm1_blis.x
-
-
-cd ../test/
-CWD=$(pwd)
-echo $CWD
-make clean
-make blis CFLAGS+="-DFLOAT"
-numactl -C 1 ./test_gemm_blis.x
-make clean
-make blis CFLAGS+="-DDOUBLE"
-numactl -C 1 ./test_gemm_blis.x
-make clean
-make blis CFLAGS+="-DSCOMPLEX"
-numactl -C 1 ./test_gemm_blis.x
-make clean
-make blis CFLAGS+="-DDCOMPLEX"
-numactl -C 1 ./test_gemm_blis.x
-
->>>>>>> Code Cleanup done; Test code updated to add performance measurement