login done
resolved conflict, login and regiter ready to test