add role_model_signup-page
resolve merge conflicts