Merge refactored roles