Finish sign in
Finish sign in with conflicts fixed