Finish sign in
fixed conflicts