add a class factory for TFRoleBase
add a class factory for TFRoleBase
Resolve conflicts