fixed issue adding user to DB
edit DAL
fixed merge conflict