reverted some changes to be tested later

theano/gof/opt.py

@@ -652,8 +652,6 @@ class MergeFeature(object):
                 continue
             if len(node.inputs) != len(candidate.inputs):
                 continue
-            if node.op != candidate.op:
-                continue
 
             cand_has_assert = False
 
@@ -690,7 +688,7 @@ class MergeFeature(object):
                                in zip(node_inputs_assert_removed,
                                       cand_inputs_assert_removed))
 
-            if inputs_match:
+            if inputs_match and node.op == candidate.op:
                 if (node, candidate) in self.blacklist:
                     # They were already tried, and there was an error
                     continue