Mediated conflict resolution

[chriseppstein]

When two blocks have a conflict, there should be a way to use a third block's styles to resolve that conflict without the ruleset from the third block specifying a value for that property.