gistfile1.rbx

      def merge_options(options, extra_options)
        (options.keys + extra_options.keys).uniq.each do |key|
          merge = options[key] && extra_options[key]
          if key == :conditions && merge
            options[key] = merge_conditions(extra_options[key], options[key])
          elsif key == :include && merge
            options[key] = merge_includes(options[key], extra_options[key]).uniq
          else
            options[key] = options[key] || extra_options[key]
          end
        end
        options
      end