0
@@ -1,12 +1,12 @@
0
 class Hash
0
-  def deep_merge other
0
-    self.dup.deep_merge! other
0
+  def merge_tree other
0
+    self.dup.merge_tree! other
0
   end
0
   
0
-  def deep_merge! other
0
+  def merge_tree! other
0
     other.each do |key, value|
0
       if self[key].is_a?(Hash) && value.is_a?(Hash)
0
-        self[key] = self[key].deep_merge(value)
0
+        self[key] = self[key].merge_tree(value)
0
       else
0
         self[key] = value
0
       end

0
@@ -321,10 +321,10 @@ module Squirrel
0
       def to_find_include
0
         @condition_blocks.inject({}) do |inc, cb|
0
           if cb.reflection.nil?
0
-            inc.merge(cb.to_find_include)
0
+            inc.merge_tree(cb.to_find_include)
0
           else
0
             inc[cb.reflection] ||= {}
0
-            inc[cb.reflection] = inc[cb.reflection].merge(cb.to_find_include)
0
+            inc[cb.reflection] = inc[cb.reflection].merge_tree(cb.to_find_include)
0
             inc
0
           end
0
         end