change db schema and add user login
merge