small oversight in merge

_test_sparse.py

@@ -284,13 +284,8 @@ class _testCase_dot(unittest.TestCase):
                 y = dense_from_sparse(dot(w.T, xw))
                 diff = x-y
                 loss = tensor.sum(tensor.sqr(diff))
-<<<<<<< /u/breuleuo/hg/theano2/_test_sparse.py
-                gw = gradient.grad(loss, w)
-                trainfn = compile.function([x, w], [y, loss, gw])
-=======
                 gw = tensor.grad(loss, w)
-                trainfn = compile.Function([x, w], [y, loss, gw])
->>>>>>> /tmp/_test_sparse.py~other.JkNMX5
+                trainfn = compile.function([x, w], [y, loss, gw])
 
                 x = xorig
                 w = mtype((500,3))