Finish sign in
resolve conflict?