Finish sign in-out
modify conflict