add argument ```storage_map``` to other makers except ```Profile_Maker```

theano/compile/debugmode.py

@@ -1826,17 +1826,12 @@ class _Linker(gof.link.LocalLinker):
         self.no_recycling = no_recycling
         return self
 
-<<<<<<< HEAD
     def make_all(self, profiler=None, input_storage=None,
                  output_storage=None, storage_map=None):
         # can't import at toplevel because of circular import TODO:
         # don't do this ugly hacky way of setting the
         # filter_checks_isfinite
         from theano.tensor import TensorType  # to set filter_check_isfinite
-=======
-    def make_all(self, profiler=None, input_storage=None
-                 , output_storage=None, storage_map=None):
->>>>>>> bf17fa1... Add argument ```storage_map``` to the rest of theano linker
 
         fgraph = self.fgraph
         input_storage_ = input_storage

theano/gof/fg.py

@@ -842,15 +842,7 @@ class FunctionGraph(utils.object2):
             self.check_integrity()
         e = FunctionGraph([equiv[i] for i in self.inputs],
                           [equiv[o] for o in self.outputs],
-<<<<<<< HEAD
-<<<<<<< HEAD
                           clone=False)
-=======
-                          clone=Flase)
->>>>>>> b2901d0... Fix a bug: While initializing a clone graph it should not be cloned again, otherwise the equiv doesn't work.
-=======
-                          clone=False)
->>>>>>> 73ae5ae... typo
         if check_integrity:
             e.check_integrity()