v4.0.0

Adds the concept of an optional :merge_strategy to Attribute.merge(). This is used to determine which value to take from when a value is present in both the attributes and params. The strategy can be set to :param_priority (default), or :attribute_priority.

The behavior before this release was attribute priority.