Stubbing out new rule
Merge conflict and new button