added migration, update table company_type
user forms and models
user can create account
before action
merge conflicts