Method does not inherit usage from trait
Marge resource types into resources

Don't apply traits on resource types. Allow resource type traits to be applied to resources after resource types are merged into resoruces.