Finish sign in
fix merge problem