Resolve import conflict again

Author: ryanncode

Mathlib.lean

@@ -4848,13 +4848,8 @@ public import Mathlib.LinearAlgebra.Basis.VectorSpace
 public import Mathlib.LinearAlgebra.BilinearForm.Basic
 public import Mathlib.LinearAlgebra.BilinearForm.DualLattice
 public import Mathlib.LinearAlgebra.BilinearForm.Hom
-<<<<<<< HEAD
 public import Mathlib.LinearAlgebra.BilinearForm.IndefiniteMetric
 public import Mathlib.LinearAlgebra.BilinearForm.KreinSpace
-=======
-public import Mathlib.LinearAlgebra.BilinearForm.Isometry
-public import Mathlib.LinearAlgebra.BilinearForm.IsometryEquiv
->>>>>>> upstream/master
 public import Mathlib.LinearAlgebra.BilinearForm.Orthogonal
 public import Mathlib.LinearAlgebra.BilinearForm.Properties
 public import Mathlib.LinearAlgebra.BilinearForm.TensorProduct