diff --git a/native/dtrti2.go b/native/dtrti2.go
index 7429c796..69e1f3eb 100644
--- a/native/dtrti2.go
+++ b/native/dtrti2.go
@@ -6,11 +6,7 @@ import (
 )
 
 // Dtrti2 computes the inverse of a triangular matrix, storing the result in place
-<<<<<<< HEAD
-// into a.
-=======
 // into a. This is the BLAS level 2 version of the algorithm.
->>>>>>> e131d240e5e881fdfa8d62252d1825c4bcee1745
 func (impl Implementation) Dtrti2(uplo blas.Uplo, diag blas.Diag, n int, a []float64, lda int) {
 	checkMatrix(n, n, a, lda)
 	if uplo != blas.Upper && uplo != blas.Lower {
diff --git a/native/lapack_test.go b/native/lapack_test.go
index 458171b8..de37ef80 100644
--- a/native/lapack_test.go
+++ b/native/lapack_test.go
@@ -116,17 +116,12 @@ func TestDtrcon(t *testing.T) {
 	testlapack.DtrconTest(t, impl)
 }
 
-<<<<<<< HEAD
-func TestDtrtri2(t *testing.T) {
-	testlapack.Dtrtri2Test(t, impl)
-=======
-func TestDtrtri(t *testing.T) {
-	testlapack.DtrtriTest(t, impl)
-}
-
 func TestDtrti2(t *testing.T) {
 	testlapack.Dtrti2Test(t, impl)
->>>>>>> e131d240e5e881fdfa8d62252d1825c4bcee1745
+}
+
+func TestDtrtri(t *testing.T) {
+	testlapack.DtrtriTest(t, impl)
 }
 
 func TestIladlc(t *testing.T) {
diff --git a/testlapack/dtrti2.go b/testlapack/dtrti2.go
index 9d83215b..dada82a3 100644
--- a/testlapack/dtrti2.go
+++ b/testlapack/dtrti2.go
@@ -14,11 +14,7 @@ type Dtrti2er interface {
 	Dtrti2(uplo blas.Uplo, diag blas.Diag, n int, a []float64, lda int)
 }
 
-<<<<<<< HEAD
-func Dtrtri2Test(t *testing.T, impl Dtrti2er) {
-=======
 func Dtrti2Test(t *testing.T, impl Dtrti2er) {
->>>>>>> e131d240e5e881fdfa8d62252d1825c4bcee1745
 	for _, test := range []struct {
 		a    []float64
 		n    int