fixed merge conflicts

Author: tanish1729

tests/tensor/rewriting/test_linalg.py

@@ -43,6 +43,9 @@
 ATOL = RTOL = 1e-3 if config.floatX == "float32" else 1e-8
 
 
+ATOL = RTOL = 1e-3 if config.floatX == "float32" else 1e-8
+
+
 def test_rop_lop():
     mx = matrix("mx")
     mv = matrix("mv")