add login register form
conflict fixed