Finish sign in
fix conflict