angular controller fix
conflict resolution
role added without migration
Devise first cut added
with pop up