Add selector for number of resource owners
Merge stuff