Added another conflict-resolving rule.