login work
fixed merge conflict