finish sign up/in
finish merge