adding the ability to merge options from more specific roles

typo fix

typo fix

typo fix